From 6f1d0eeac6a7ae745ebf4ae290a090adb85c12dc Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Wed, 2 Oct 2024 15:08:12 -0700
Subject: [PATCH 001/118] chore: replace EarnDepositMode with EarnEnterMode

---
 src/earn/EarnEnterAmount.tsx    | 4 ++--
 src/earn/prepareTransactions.ts | 4 ++--
 src/earn/types.ts               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index bdd41e5c77b..1c125fbe440 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -22,7 +22,7 @@ import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { usePrepareDepositTransactions } from 'src/earn/prepareTransactions'
-import { EarnDepositMode } from 'src/earn/types'
+import { EarnEnterMode } from 'src/earn/types'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -59,7 +59,7 @@ const TOKEN_SELECTOR_BORDER_RADIUS = 100
 const MAX_BORDER_RADIUS = 96
 const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
 
-function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnDepositMode }) {
+function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode }) {
   const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
   const swappableTokens = useSelector((state) =>
     swappableFromTokensByNetworkIdSelector(state, [pool.networkId])
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 61b14269ac9..176f50e7c3c 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import _ from 'lodash'
 import { useAsyncCallback } from 'react-async-hook'
-import { EarnDepositMode, PrepareWithdrawAndClaimParams } from 'src/earn/types'
+import { EarnEnterMode, PrepareWithdrawAndClaimParams } from 'src/earn/types'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { triggerShortcutRequest } from 'src/positions/saga'
 import { RawShortcutTransaction } from 'src/positions/slice'
@@ -34,7 +34,7 @@ export async function prepareDepositTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: EarnDepositMode
+  shortcutId: EarnEnterMode
 }) {
   const { enableAppFee } = getDynamicConfigParams(DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG])
   const args =
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 883645eefad..9f17cfb211e 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -64,4 +64,4 @@ export interface BeforeDepositAction {
   onPress: () => void
 }
 
-export type EarnDepositMode = 'deposit' | 'swap-deposit'
+export type EarnEnterMode = 'deposit' | 'swap-deposit' | 'withdraw'

From 06ce84ec79f70d765c6032060a4b470bfcbe51e2 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Wed, 2 Oct 2024 16:50:22 -0700
Subject: [PATCH 002/118] feat(earn): support partial withdrawals

---
 locales/base/translation.json   |   2 +
 src/earn/EarnEnterAmount.tsx    | 133 +++++++++++++++++++++++++++++---
 src/earn/EarnPoolInfoScreen.tsx |  36 ++++++---
 src/earn/prepareTransactions.ts |  66 ++++++++++++++++
 4 files changed, 215 insertions(+), 22 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index e4b4e748ad5..89acd1455f0 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2554,8 +2554,10 @@
     },
     "enterAmount": {
       "title": "How much would you like to deposit?",
+      "titleWithdraw": "How much would you like to withdraw?",
       "deposit": "Deposit",
       "fees": "Fees",
+      "available": "Available",
       "swap": "Swap",
       "earnUpToLabel": "You could earn up to:",
       "rateLabel": "Rate (est.)",
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 1c125fbe440..51df5b29f64 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,7 +21,10 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import { usePrepareDepositTransactions } from 'src/earn/prepareTransactions'
+import {
+  usePrepareDepositTransactions,
+  usePrepareWithdrawTransactions,
+} from 'src/earn/prepareTransactions'
 import { EarnEnterMode } from 'src/earn/types'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
@@ -61,6 +64,7 @@ const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
 
 function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode }) {
   const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
+  const withdrawToken = useTokenInfo(pool.dataProps.withdrawTokenId)
   const swappableTokens = useSelector((state) =>
     swappableFromTokensByNetworkIdSelector(state, [pool.networkId])
   )
@@ -81,7 +85,19 @@ function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode })
     throw new Error(`Token info not found for token ID ${pool.dataProps.depositTokenId}`)
   }
 
-  return mode === 'deposit' ? [depositToken] : eligibleSwappableTokens
+  if (!withdrawToken) {
+    // should never happen
+    throw new Error(`Token info not found for token ID ${pool.dataProps.withdrawTokenId}`)
+  }
+
+  switch (mode) {
+    case 'deposit':
+      return [depositToken]
+    case 'withdraw':
+      return [withdrawToken]
+    case 'swap-deposit':
+      return eligibleSwappableTokens
+  }
 }
 
 function EarnEnterAmount({ route }: Props) {
@@ -102,6 +118,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const [tokenAmountInput, setTokenAmountInput] = useState<string>('')
   const [localAmountInput, setLocalAmountInput] = useState<string>('')
+  const [maxPressed, setMaxPressed] = useState(false)
   const [enteredIn, setEnteredIn] = useState<AmountEnteredIn>('token')
   // this should never be null, just adding a default to make TS happy
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol) ?? LocalCurrencySymbol.USD
@@ -122,13 +139,17 @@ function EarnEnterAmount({ route }: Props) {
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
 
+  // Avoid conditionally calling hooks
+  const depositTransaction = usePrepareDepositTransactions()
+  const withdrawTransaction = usePrepareWithdrawTransactions()
+
   const {
     prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = usePrepareDepositTransactions()
+  } = mode === 'withdraw' ? withdrawTransaction : depositTransaction
 
   const walletAddress = useSelector(walletAddressSelector)
 
@@ -150,6 +171,7 @@ function EarnEnterAmount({ route }: Props) {
       pool,
       hooksApiUrl,
       shortcutId: mode,
+      useMax: maxPressed,
     })
   }
 
@@ -225,7 +247,10 @@ function EarnEnterAmount({ route }: Props) {
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
-  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(token.balance)
+  const isAmountLessThanBalance =
+    mode === 'withdraw'
+      ? tokenAmount && tokenAmount.lte(pool.balance)
+      : tokenAmount && tokenAmount.lte(token.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -241,6 +266,7 @@ function EarnEnterAmount({ route }: Props) {
     !!tokenAmount?.isZero() || !transactionIsPossible
 
   const onTokenAmountInputChange = (value: string) => {
+    setMaxPressed(false)
     if (!value) {
       setTokenAmountInput('')
       setEnteredIn('token')
@@ -256,6 +282,7 @@ function EarnEnterAmount({ route }: Props) {
   }
 
   const onLocalAmountInputChange = (value: string) => {
+    setMaxPressed(false)
     // remove leading currency symbol and grouping separators
     if (value.startsWith(localCurrencySymbol)) {
       value = value.slice(1)
@@ -282,8 +309,13 @@ function EarnEnterAmount({ route }: Props) {
     // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
-    setTokenAmountInput(token.balance.toFormat({ decimalSeparator }))
+    if (mode === 'withdraw') {
+      setTokenAmountInput(new BigNumber(pool.balance).toFormat({ decimalSeparator }))
+    } else {
+      setTokenAmountInput(token.balance.toFormat({ decimalSeparator }))
+    }
     setEnteredIn('token')
+    setMaxPressed(true)
     tokenAmountInputRef.current?.blur()
     localAmountInputRef.current?.blur()
     AppAnalytics.track(SendEvents.max_pressed, {
@@ -312,6 +344,7 @@ function EarnEnterAmount({ route }: Props) {
         ? getSwapToAmountInDecimals({ swapTransaction, fromAmount: tokenAmount }).toString()
         : tokenAmount.toString(),
     })
+    // TODO(ACT-1389) if mode === 'withdraw' navigate to EarnConfirmationScreen
     reviewBottomSheetRef.current?.snapToIndex(0)
   }
 
@@ -320,7 +353,11 @@ function EarnEnterAmount({ route }: Props) {
       <CustomHeader style={{ paddingHorizontal: Spacing.Thick24 }} left={<BackButton />} />
       <KeyboardAwareScrollView contentContainerStyle={styles.contentContainer}>
         <View style={styles.inputContainer}>
-          <Text style={styles.title}>{t('earnFlow.enterAmount.title')}</Text>
+          <Text style={styles.title}>
+            {mode === 'withdraw'
+              ? t('earnFlow.enterAmount.titleWithdraw')
+              : t('earnFlow.enterAmount.title')}
+          </Text>
           <View style={styles.inputBox}>
             <View style={styles.inputRow}>
               <AmountInput
@@ -368,8 +405,8 @@ function EarnEnterAmount({ route }: Props) {
               )}
             </View>
           </View>
-          {tokenAmount && prepareTransactionsResult && (
-            <TransactionDetails
+          {tokenAmount && prepareTransactionsResult && mode !== 'withdraw' && (
+            <TransactionDepositDetails
               pool={pool}
               token={token}
               tokenAmount={tokenAmount}
@@ -379,6 +416,15 @@ function EarnEnterAmount({ route }: Props) {
               swapTransaction={swapTransaction}
             />
           )}
+          {mode === 'withdraw' && (
+            <TransactionWithdrawDetails
+              pool={pool}
+              token={token}
+              tokenAmount={tokenAmount}
+              prepareTransactionsResult={prepareTransactionsResult}
+              feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
+            />
+          )}
         </View>
         {showNotEnoughBalanceForGasWarning && (
           <InLineNotification
@@ -425,7 +471,7 @@ function EarnEnterAmount({ route }: Props) {
             testID="EarnEnterAmount/NotEnoughBalanceWarning"
           />
         )}
-        {prepareTransactionError && (
+        {prepareTransactionError && mode !== 'withdraw' && (
           <InLineNotification
             variant={NotificationVariant.Error}
             title={t('sendEnterAmountScreen.prepareTransactionError.title')}
@@ -492,7 +538,72 @@ function EarnEnterAmount({ route }: Props) {
   )
 }
 
-function TransactionDetails({
+function TransactionWithdrawDetails({
+  pool,
+  token,
+  prepareTransactionsResult,
+  feeDetailsBottomSheetRef,
+}: {
+  pool: EarnPosition
+  token: TokenBalance
+  prepareTransactionsResult?: PreparedTransactionsResult
+  feeDetailsBottomSheetRef: React.RefObject<BottomSheetModalRefType>
+}) {
+  const { t } = useTranslation()
+  const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(prepareTransactionsResult)
+
+  return (
+    <View style={styles.txDetailsContainer} testID="EnterAmountWithdrawInfoCard">
+      <View style={styles.txDetailsLineItem}>
+        <LabelWithInfo
+          label={t('earnFlow.enterAmount.available')}
+          testID="LabelWithInfo/AvailableLabel"
+        />
+        <View style={styles.txDetailsValue}>
+          <TokenDisplay
+            tokenId={token.tokenId}
+            testID="EarnEnterAmount/Deposit/Crypto"
+            amount={pool.balance}
+            showLocalAmount={true}
+            style={styles.txDetailsValueText}
+          />
+          <Text style={[styles.txDetailsValueText, styles.gray4]}>
+            {'('}
+            <TokenDisplay
+              testID="EarnEnterAmount/Deposit/Fiat"
+              tokenId={token.tokenId}
+              amount={pool.balance}
+              showLocalAmount={false}
+            />
+            {')'}
+          </Text>
+        </View>
+      </View>
+      {feeCurrency && maxFeeAmount && (
+        <View style={styles.txDetailsLineItem}>
+          <LabelWithInfo
+            label={t('earnFlow.enterAmount.fees')}
+            onPress={() => {
+              feeDetailsBottomSheetRef?.current?.snapToIndex(0)
+            }}
+            testID="LabelWithInfo/FeeLabel"
+          />
+          <View style={styles.txDetailsValue}>
+            <TokenDisplay
+              testID="EarnEnterAmount/Fees"
+              tokenId={feeCurrency.tokenId}
+              // TODO: add swap fees to this amount
+              amount={maxFeeAmount.toString()}
+              style={styles.txDetailsValueText}
+            />
+          </View>
+        </View>
+      )}
+    </View>
+  )
+}
+
+function TransactionDepositDetails({
   pool,
   token,
   tokenAmount,
@@ -523,7 +634,7 @@ function TransactionDetails({
   return (
     feeCurrency &&
     maxFeeAmount && (
-      <View style={styles.txDetailsContainer} testID="EnterAmountInfoCard">
+      <View style={styles.txDetailsContainer} testID="EnterAmountDepositInfoCard">
         {swapTransaction && (
           <View style={styles.txDetailsLineItem}>
             <LabelWithInfo
diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
index 1c27b65b630..60e6813ab23 100644
--- a/src/earn/EarnPoolInfoScreen.tsx
+++ b/src/earn/EarnPoolInfoScreen.tsx
@@ -421,9 +421,11 @@ function LearnMoreTouchable({
 function ActionButtons({
   earnPosition,
   onPressDeposit,
+  onPressWithdraw,
 }: {
   earnPosition: EarnPosition
   onPressDeposit: () => void
+  onPressWithdraw: () => void
 }) {
   const { bottom } = useSafeAreaInsets()
   const insetsStyle = {
@@ -440,16 +442,7 @@ function ActionButtons({
       {withdraw && (
         <Button
           text={t('earnFlow.poolInfoScreen.withdraw')}
-          onPress={() => {
-            AppAnalytics.track(EarnEvents.earn_pool_info_tap_withdraw, {
-              poolId: earnPosition.positionId,
-              providerId: earnPosition.appId,
-              poolAmount: earnPosition.balance,
-              networkId: earnPosition.networkId,
-              depositTokenId: earnPosition.dataProps.depositTokenId,
-            })
-            navigate(Screens.EarnCollectScreen, { pool: earnPosition })
-          }}
+          onPress={onPressWithdraw}
           size={BtnSizes.FULL}
           type={BtnTypes.SECONDARY}
           style={styles.flex}
@@ -493,6 +486,23 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
     exchanges,
   } = useDepositEntrypointInfo({ allTokens, pool })
 
+  const onPressWithdraw = () => {
+    AppAnalytics.track(EarnEvents.earn_pool_info_tap_withdraw, {
+      poolId: positionId,
+      providerId: appId,
+      poolAmount: balance,
+      networkId,
+      depositTokenId: dataProps.depositTokenId,
+    })
+    // TODO(Tomm): is a feature flag for partial withdrawals needed?
+    const partialWithdrawalsEnabled = true
+    if (partialWithdrawalsEnabled) {
+      navigate(Screens.EarnEnterAmount, { pool, mode: 'withdraw' })
+    } else {
+      navigate(Screens.EarnCollectScreen, { pool })
+    }
+  }
+
   const onPressDeposit = () => {
     AppAnalytics.track(EarnEvents.earn_pool_info_tap_deposit, {
       poolId: positionId,
@@ -614,7 +624,11 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
           ) : null}
         </View>
       </Animated.ScrollView>
-      <ActionButtons earnPosition={pool} onPressDeposit={onPressDeposit} />
+      <ActionButtons
+        earnPosition={pool}
+        onPressDeposit={onPressDeposit}
+        onPressWithdraw={onPressWithdraw}
+      />
       <InfoBottomSheet
         infoBottomSheetRef={depositInfoBottomSheetRef}
         titleKey="earnFlow.poolInfoScreen.depositAndEarnings"
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 176f50e7c3c..c665110d1c8 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -164,3 +164,69 @@ export async function prepareWithdrawAndClaimTransactions({
     origin: 'earn-withdraw',
   })
 }
+
+export async function prepareWithdrawTransactions({
+  amount,
+  token,
+  walletAddress,
+  feeCurrencies,
+  pool,
+  hooksApiUrl,
+  shortcutId,
+  useMax,
+}: {
+  amount: string
+  token: TokenBalance
+  walletAddress: Address
+  feeCurrencies: TokenBalance[]
+  pool: EarnPosition
+  hooksApiUrl: string
+  shortcutId: EarnEnterMode
+  useMax: boolean
+}) {
+  const { dataProps } = pool
+  const { transactions }: { transactions: RawShortcutTransaction[] } = await triggerShortcutRequest(
+    hooksApiUrl,
+    {
+      address: walletAddress,
+      appId: pool.appId,
+      networkId: pool.networkId,
+      shortcutId,
+      tokens: [
+        {
+          tokenId: dataProps.withdrawTokenId,
+          amount,
+          useMax,
+        },
+      ],
+      ...pool.shortcutTriggerArgs?.[shortcutId],
+    }
+  )
+
+  return {
+    prepareTransactionsResult: await prepareTransactions({
+      feeCurrencies,
+      baseTransactions: rawShortcutTransactionsToTransactionRequests(transactions),
+      isGasSubsidized: isGasSubsidizedForNetwork(token.networkId),
+      origin: `earn-${shortcutId}`,
+    }),
+    swapTransaction: null,
+  }
+}
+
+export function usePrepareWithdrawTransactions() {
+  const prepareTransactions = useAsyncCallback(prepareWithdrawTransactions, {
+    onError: (err) => {
+      const error = ensureError(err)
+      Logger.error(TAG, 'usePrepareWithdrawTransactions', error)
+    },
+  })
+
+  return {
+    prepareTransactionsResult: prepareTransactions.result,
+    refreshPreparedTransactions: prepareTransactions.execute,
+    clearPreparedTransactions: prepareTransactions.reset,
+    prepareTransactionError: prepareTransactions.error,
+    isPreparingTransactions: prepareTransactions.loading,
+  }
+}

From 3feb5f8e47158dff93ee8f707d48b41257b90dfa Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 7 Oct 2024 18:06:55 -0700
Subject: [PATCH 003/118] feat(earn): support partial withdrawals for earn
 pools

---
 src/earn/EarnEnterAmount.test.tsx |   5 +
 src/earn/EarnEnterAmount.tsx      | 161 ++++++++++++++++++------------
 src/earn/prepareTransactions.ts   |   2 +-
 src/earn/types.ts                 |   2 +-
 src/navigator/types.tsx           |   4 +-
 test/values.ts                    |  12 +++
 6 files changed, 118 insertions(+), 68 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 83bd6dc5624..5564af6e585 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -111,6 +111,7 @@ const mockSwapTransaction: SwapTransaction = {
 const store = createMockStore({
   tokens: {
     tokenBalances: {
+      ...mockTokenBalances,
       [mockArbUsdcTokenId]: {
         ...mockTokenBalances[mockArbUsdcTokenId],
         balance: '10',
@@ -187,6 +188,7 @@ describe('EarnEnterAmount', () => {
         hooksApiUrl: networkConfig.hooksApiUrl,
         feeCurrencies: mockFeeCurrencies,
         shortcutId: 'deposit',
+        useMax: false,
       })
     })
 
@@ -262,6 +264,7 @@ describe('EarnEnterAmount', () => {
       const store = createMockStore({
         tokens: {
           tokenBalances: {
+            ...mockTokenBalances,
             [mockArbUsdcTokenId]: {
               ...mockTokenBalances[mockArbUsdcTokenId],
               balance: '10',
@@ -314,6 +317,7 @@ describe('EarnEnterAmount', () => {
         hooksApiUrl: networkConfig.hooksApiUrl,
         feeCurrencies: mockFeeCurrencies,
         shortcutId: 'swap-deposit',
+        useMax: false,
       })
     })
 
@@ -443,6 +447,7 @@ describe('EarnEnterAmount', () => {
     const mockStore = createMockStore({
       tokens: {
         tokenBalances: {
+          ...mockTokenBalances,
           [mockArbUsdcTokenId]: {
             ...mockTokenBalances[mockArbUsdcTokenId],
             balance: '100000.42',
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 51df5b29f64..8c4f384d354 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -25,7 +25,6 @@ import {
   usePrepareDepositTransactions,
   usePrepareWithdrawTransactions,
 } from 'src/earn/prepareTransactions'
-import { EarnEnterMode } from 'src/earn/types'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -62,8 +61,8 @@ const TOKEN_SELECTOR_BORDER_RADIUS = 100
 const MAX_BORDER_RADIUS = 96
 const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
 
-function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode }) {
-  const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
+function useTokens({ pool }: { pool: EarnPosition }) {
+  const inputToken = useTokenInfo(pool.dataProps.depositTokenId)
   const withdrawToken = useTokenInfo(pool.dataProps.withdrawTokenId)
   const swappableTokens = useSelector((state) =>
     swappableFromTokensByNetworkIdSelector(state, [pool.networkId])
@@ -80,7 +79,7 @@ function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode })
     [swappableTokens, pool.dataProps.depositTokenId, pool.dataProps.withdrawTokenId]
   )
 
-  if (!depositToken) {
+  if (!inputToken) {
     // should never happen
     throw new Error(`Token info not found for token ID ${pool.dataProps.depositTokenId}`)
   }
@@ -90,13 +89,10 @@ function useTokens({ pool, mode }: { pool: EarnPosition; mode: EarnEnterMode })
     throw new Error(`Token info not found for token ID ${pool.dataProps.withdrawTokenId}`)
   }
 
-  switch (mode) {
-    case 'deposit':
-      return [depositToken]
-    case 'withdraw':
-      return [withdrawToken]
-    case 'swap-deposit':
-      return eligibleSwappableTokens
+  return {
+    depositTokens: [inputToken],
+    withdrawTokens: [withdrawToken],
+    eligibleSwappableTokens: eligibleSwappableTokens,
   }
 }
 
@@ -104,10 +100,21 @@ function EarnEnterAmount({ route }: Props) {
   const { t } = useTranslation()
 
   const { pool, mode = 'deposit' } = route.params
-  const tokens = useTokens({ pool, mode })
+  const isWithdrawal = mode === 'withdraw'
+  const { depositTokens, withdrawTokens, eligibleSwappableTokens } = useTokens({ pool })
 
-  const [token, setToken] = useState<TokenBalance>(() => tokens[0])
-  const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
+  const availableFromTokens = useMemo(() => {
+    switch (mode) {
+      case 'deposit':
+      case 'withdraw': // We want to show the deposit token in the dropdown for withdrawal
+        return depositTokens
+      case 'swap-deposit':
+        return eligibleSwappableTokens
+    }
+  }, [mode])
+
+  const [inputToken, setInputToken] = useState<TokenBalance>(() => availableFromTokens[0])
+  const [withdrawToken, _setWithdrawToken] = useState<TokenBalance>(() => withdrawTokens[0])
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -127,14 +134,14 @@ function EarnEnterAmount({ route }: Props) {
   const onTokenPickerSelect = () => {
     tokenBottomSheetRef.current?.snapToIndex(0)
     AppAnalytics.track(SendEvents.token_dropdown_opened, {
-      currentTokenId: token.tokenId,
-      currentTokenAddress: token.address,
-      currentNetworkId: token.networkId,
+      currentTokenId: inputToken.tokenId,
+      currentTokenAddress: inputToken.address,
+      currentNetworkId: inputToken.networkId,
     })
   }
 
   const onSelectToken = (token: TokenBalance) => {
-    setToken(token)
+    setInputToken(token)
     tokenBottomSheetRef.current?.close()
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
@@ -149,7 +156,7 @@ function EarnEnterAmount({ route }: Props) {
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = mode === 'withdraw' ? withdrawTransaction : depositTransaction
+  } = isWithdrawal ? withdrawTransaction : depositTransaction
 
   const walletAddress = useSelector(walletAddressSelector)
 
@@ -197,8 +204,15 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, token.tokenId)
-  const localToToken = useLocalToTokenAmount(parsedLocalAmount, token.tokenId)
+  const tokenToLocal = useTokenToLocalAmount(
+    parsedTokenAmount,
+    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
+  )
+  const localToToken = useLocalToTokenAmount(
+    parsedLocalAmount,
+    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
+  )
+
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
       setLocalAmountInput(
@@ -215,7 +229,7 @@ function EarnEnterAmount({ route }: Props) {
         localToToken && localToToken.gt(0)
           ? // no group separator for token amount, round to token.decimals and strip trailing zeros
             localToToken
-              .toFormat(token.decimals, { decimalSeparator })
+              .toFormat(inputToken.decimals, { decimalSeparator })
               .replace(new RegExp(`[${decimalSeparator}]?0+$`), '')
           : ''
       )
@@ -224,9 +238,14 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, token])
+  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode, withdrawToken])
 
-  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, token.networkId))
+  const feeCurrencies = useSelector((state) =>
+    feeCurrenciesSelector(
+      state,
+      mode === 'withdraw' ? withdrawToken.networkId : inputToken.networkId
+    )
+  )
 
   useEffect(() => {
     clearPreparedTransactions()
@@ -234,15 +253,19 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(token.balance)
+      tokenAmount.isGreaterThan(isWithdrawal ? withdrawToken.balance : inputToken.balance)
     ) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(tokenAmount, token, feeCurrencies)
+      return handleRefreshPreparedTransactions(
+        tokenAmount,
+        isWithdrawal ? withdrawToken : inputToken,
+        feeCurrencies
+      )
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, token])
+  }, [tokenAmount, inputToken, mode, withdrawToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -250,7 +273,7 @@ function EarnEnterAmount({ route }: Props) {
   const isAmountLessThanBalance =
     mode === 'withdraw'
       ? tokenAmount && tokenAmount.lte(pool.balance)
-      : tokenAmount && tokenAmount.lte(token.balance)
+      : tokenAmount && tokenAmount.lte(inputToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -263,7 +286,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const disabled =
     // Should disable if the user enters 0, has enough balance but the transaction is not possible, or does not have enough balance
-    !!tokenAmount?.isZero() || !transactionIsPossible
+    !!tokenAmount?.isZero() || (!isWithdrawal && !transactionIsPossible)
 
   const onTokenAmountInputChange = (value: string) => {
     setMaxPressed(false)
@@ -309,35 +332,35 @@ function EarnEnterAmount({ route }: Props) {
     // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
-    if (mode === 'withdraw') {
+    if (isWithdrawal) {
       setTokenAmountInput(new BigNumber(pool.balance).toFormat({ decimalSeparator }))
     } else {
-      setTokenAmountInput(token.balance.toFormat({ decimalSeparator }))
+      setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
     }
     setEnteredIn('token')
     setMaxPressed(true)
     tokenAmountInputRef.current?.blur()
     localAmountInputRef.current?.blur()
     AppAnalytics.track(SendEvents.max_pressed, {
-      tokenId: token.tokenId,
-      tokenAddress: token.address,
-      networkId: token.networkId,
+      tokenId: inputToken.tokenId,
+      tokenAddress: inputToken.address,
+      networkId: inputToken.networkId,
     })
   }
 
   const onPressContinue = () => {
-    if (!tokenAmount || !depositToken) {
+    if (!tokenAmount || !inputToken) {
       // should never happen
       return
     }
     AppAnalytics.track(EarnEvents.earn_enter_amount_continue_press, {
-      amountInUsd: tokenAmount.multipliedBy(token.priceUsd ?? 0).toFixed(2),
+      amountInUsd: tokenAmount.multipliedBy(inputToken.priceUsd ?? 0).toFixed(2),
       amountEnteredIn: enteredIn,
       depositTokenId: pool.dataProps.depositTokenId,
-      networkId: token.networkId,
+      networkId: inputToken.networkId,
       providerId: pool.appId,
       poolId: pool.positionId,
-      fromTokenId: token.tokenId,
+      fromTokenId: inputToken.tokenId,
       fromTokenAmount: tokenAmount.toString(),
       mode,
       depositTokenAmount: swapTransaction
@@ -348,13 +371,24 @@ function EarnEnterAmount({ route }: Props) {
     reviewBottomSheetRef.current?.snapToIndex(0)
   }
 
+  const dropdownEnabled = useMemo(() => {
+    switch (mode) {
+      case 'withdraw':
+        return withdrawTokens.length > 1
+      default:
+      case 'swap-deposit':
+      case 'deposit':
+        return availableFromTokens.length > 1
+    }
+  }, [mode, availableFromTokens, withdrawTokens, depositTokens])
+
   return (
     <SafeAreaView style={styles.safeAreaContainer}>
       <CustomHeader style={{ paddingHorizontal: Spacing.Thick24 }} left={<BackButton />} />
       <KeyboardAwareScrollView contentContainerStyle={styles.contentContainer}>
         <View style={styles.inputContainer}>
           <Text style={styles.title}>
-            {mode === 'withdraw'
+            {isWithdrawal
               ? t('earnFlow.enterAmount.titleWithdraw')
               : t('earnFlow.enterAmount.title')}
           </Text>
@@ -373,27 +407,27 @@ function EarnEnterAmount({ route }: Props) {
                 borderRadius={TOKEN_SELECTOR_BORDER_RADIUS}
                 onPress={onTokenPickerSelect}
                 style={styles.tokenSelectButton}
-                disabled={tokens.length === 1}
+                disabled={!dropdownEnabled}
                 testID="EarnEnterAmount/TokenSelect"
               >
                 <>
-                  <TokenIcon token={token} size={IconSize.SMALL} />
-                  <Text style={styles.tokenName}>{token.symbol}</Text>
-                  {tokens.length > 1 && <DownArrowIcon color={Colors.gray5} />}
+                  <TokenIcon token={inputToken} size={IconSize.SMALL} />
+                  <Text style={styles.tokenName}>{inputToken.symbol}</Text>
+                  {dropdownEnabled && <DownArrowIcon color={Colors.gray5} />}
                 </>
               </Touchable>
             </View>
             <View style={styles.localAmountRow}>
               <AmountInput
-                inputValue={token.priceUsd ? localAmountInput : '-'}
+                inputValue={inputToken.priceUsd ? localAmountInput : '-'}
                 onInputChange={onLocalAmountInputChange}
                 inputRef={localAmountInputRef}
                 inputStyle={styles.localAmount}
                 placeholder={`${localCurrencySymbol}${new BigNumber(0).toFormat(2)}`}
                 testID="EarnEnterAmount/LocalAmountInput"
-                editable={!!token.priceUsd}
+                editable={!!inputToken.priceUsd}
               />
-              {!token.balance.isZero() && (
+              {(isWithdrawal ? !withdrawToken.balance.isZero() : !inputToken.balance.isZero()) && (
                 <Touchable
                   borderRadius={MAX_BORDER_RADIUS}
                   onPress={onMaxAmountPress}
@@ -405,10 +439,10 @@ function EarnEnterAmount({ route }: Props) {
               )}
             </View>
           </View>
-          {tokenAmount && prepareTransactionsResult && mode !== 'withdraw' && (
+          {tokenAmount && prepareTransactionsResult && !isWithdrawal && (
             <TransactionDepositDetails
               pool={pool}
-              token={token}
+              token={inputToken}
               tokenAmount={tokenAmount}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
@@ -416,11 +450,10 @@ function EarnEnterAmount({ route }: Props) {
               swapTransaction={swapTransaction}
             />
           )}
-          {mode === 'withdraw' && (
+          {tokenAmount && prepareTransactionsResult && isWithdrawal && (
             <TransactionWithdrawDetails
               pool={pool}
-              token={token}
-              tokenAmount={tokenAmount}
+              token={inputToken}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
             />
@@ -462,16 +495,16 @@ function EarnEnterAmount({ route }: Props) {
           <InLineNotification
             variant={NotificationVariant.Warning}
             title={t('sendEnterAmountScreen.insufficientBalanceWarning.title', {
-              tokenSymbol: token.symbol,
+              tokenSymbol: inputToken.symbol,
             })}
             description={t('sendEnterAmountScreen.insufficientBalanceWarning.description', {
-              tokenSymbol: token.symbol,
+              tokenSymbol: inputToken.symbol,
             })}
             style={styles.warning}
             testID="EarnEnterAmount/NotEnoughBalanceWarning"
           />
         )}
-        {prepareTransactionError && mode !== 'withdraw' && (
+        {prepareTransactionError && (
           <InLineNotification
             variant={NotificationVariant.Error}
             title={t('sendEnterAmountScreen.prepareTransactionError.title')}
@@ -500,7 +533,7 @@ function EarnEnterAmount({ route }: Props) {
           maxFeeAmount={maxFeeAmount}
           swapTransaction={swapTransaction}
           pool={pool}
-          token={token}
+          token={inputToken}
           tokenAmount={tokenAmount}
         />
       )}
@@ -509,7 +542,7 @@ function EarnEnterAmount({ route }: Props) {
           forwardedRef={swapDetailsBottomSheetRef}
           testID="SwapDetailsBottomSheet"
           swapTransaction={swapTransaction}
-          token={token}
+          token={inputToken}
           pool={pool}
           tokenAmount={tokenAmount}
           parsedTokenAmount={parsedTokenAmount}
@@ -523,14 +556,14 @@ function EarnEnterAmount({ route }: Props) {
           pool={pool}
           mode={mode}
           swapTransaction={swapTransaction}
-          inputTokenId={token.tokenId}
+          inputTokenId={inputToken.tokenId}
         />
       )}
       <TokenBottomSheet
         forwardedRef={tokenBottomSheetRef}
         origin={TokenPickerOrigin.Earn}
         onTokenSelected={onSelectToken}
-        tokens={tokens}
+        tokens={availableFromTokens}
         title={t('sendEnterAmountScreen.selectToken')}
         titleStyle={styles.title}
       />
@@ -731,9 +764,9 @@ function FeeDetailsBottomSheet({
   tokenAmount: BigNumber
 }) {
   const { t } = useTranslation()
-  const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
+  const inputToken = useTokenInfo(pool.dataProps.depositTokenId)
 
-  if (!depositToken) {
+  if (!inputToken) {
     // should never happen
     throw new Error(`Token info not found for token ID ${pool.dataProps.depositTokenId}`)
   }
@@ -865,9 +898,9 @@ function SwapDetailsBottomSheet({
   parsedTokenAmount: BigNumber
 }) {
   const { t } = useTranslation()
-  const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
+  const inputToken = useTokenInfo(pool.dataProps.depositTokenId)
 
-  if (!depositToken) {
+  if (!inputToken) {
     // should never happen
     throw new Error(`Token info not found for token ID ${pool.dataProps.depositTokenId}`)
   }
@@ -908,12 +941,12 @@ function SwapDetailsBottomSheet({
             </Text>
             <Text style={styles.bottomSheetLineLabelText} testID="SwapTo/Value">
               <TokenDisplay
-                tokenId={depositToken.tokenId}
+                tokenId={inputToken.tokenId}
                 showLocalAmount={false}
                 amount={swapToAmount}
               />
               {' ('}
-              <TokenDisplay tokenId={depositToken.tokenId} amount={swapToAmount} />
+              <TokenDisplay tokenId={inputToken.tokenId} amount={swapToAmount} />
               {')'}
             </Text>
           </View>
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index c665110d1c8..d0b5ef1326d 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -210,7 +210,7 @@ export async function prepareWithdrawTransactions({
       isGasSubsidized: isGasSubsidizedForNetwork(token.networkId),
       origin: `earn-${shortcutId}`,
     }),
-    swapTransaction: null,
+    swapTransaction: undefined,
   }
 }
 
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 9f17cfb211e..aed23697f05 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -9,7 +9,7 @@ export interface DepositInfo {
   amount: string
   preparedTransactions: SerializableTransactionRequest[]
   pool: EarnPosition
-  mode: EarnDepositMode
+  mode: EarnEnterMode
   fromTokenId: string
   fromTokenAmount: string
 }
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index c80f7219b19..41b83262418 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -1,6 +1,6 @@
 import { KycSchema } from '@fiatconnect/fiatconnect-types'
 import { SendOrigin, WalletConnectPairingOrigin } from 'src/analytics/types'
-import { EarnDepositMode, EarnTabType } from 'src/earn/types'
+import { EarnEnterMode, EarnTabType } from 'src/earn/types'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
 import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
@@ -79,7 +79,7 @@ export type StackParamList = {
   [Screens.DappsScreen]: undefined
   [Screens.DebugImages]: undefined
   [Screens.EarnInfoScreen]: undefined
-  [Screens.EarnEnterAmount]: { pool: EarnPosition; mode?: EarnDepositMode }
+  [Screens.EarnEnterAmount]: { pool: EarnPosition; mode?: EarnEnterMode }
   [Screens.EarnCollectScreen]: { pool: EarnPosition }
   [Screens.EarnHome]: { activeEarnTab?: EarnTabType } | undefined
   [Screens.EarnPoolInfoScreen]: { pool: EarnPosition }
diff --git a/test/values.ts b/test/values.ts
index eead3c3347e..3ec0cededa1 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -573,6 +573,18 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     priceUsd: '1.2',
     priceFetchedAt: Date.now(),
   },
+  [mockAaveArbUsdcAddress]: {
+    name: 'Aave USDC',
+    networkId: NetworkId['arbitrum-sepolia'],
+    tokenId: mockAaveArbUsdcTokenId,
+    address: mockAaveArbUsdcAddress,
+    symbol: 'AUSDC',
+    decimals: 6,
+    imageUrl: 'https://example.com/address-metadata/main/assets/tokens/AUSDC.png',
+    balance: '0',
+    priceUsd: '1',
+    priceFetchedAt: Date.now(),
+  },
 }
 
 export const mockCeloTokenBalance: TokenBalance = {

From dc155d26c3e67e9c63d24312811ebedb274d9aa0 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 7 Oct 2024 18:11:51 -0700
Subject: [PATCH 004/118] fix(earn): rename EarnDepositMode to EarnEnterMode

---
 src/earn/EarnDepositBottomSheet.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 284ae2a5fab..ab05b7bd18a 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -12,7 +12,7 @@ import TokenDisplay from 'src/components/TokenDisplay'
 import { getTotalYieldRate } from 'src/earn/poolInfo'
 import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
-import { EarnDepositMode } from 'src/earn/types'
+import { EarnEnterMode } from 'src/earn/types'
 import { getSwapToAmountInDecimals, isGasSubsidizedForNetwork } from 'src/earn/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
 import { EarnPosition } from 'src/positions/types'
@@ -47,7 +47,7 @@ export default function EarnDepositBottomSheet({
   inputTokenId: string
   inputAmount: BigNumber
   pool: EarnPosition
-  mode: EarnDepositMode
+  mode: EarnEnterMode
   swapTransaction?: SwapTransaction
 }) {
   const { t } = useTranslation()

From a33d30c79eafa45f43b50721ded37e47f1eb12c1 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 7 Oct 2024 18:14:36 -0700
Subject: [PATCH 005/118] fix(earn): rename EarnDepositMode to EarnEnterMode

---
 src/analytics/Properties.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 9aeca696e66..3d480e2ade6 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -54,7 +54,7 @@ import { ErrorMessages } from 'src/app/ErrorMessages'
 import { AddAssetsActionType } from 'src/components/AddAssetsBottomSheet'
 import { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { DappSection } from 'src/dapps/types'
-import { BeforeDepositActionName, EarnDepositMode, SerializableRewardsInfo } from 'src/earn/types'
+import { BeforeDepositActionName, EarnEnterMode, SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
@@ -1553,7 +1553,7 @@ export interface EarnCommonProperties {
 
 interface EarnDepositProperties extends EarnCommonProperties {
   depositTokenAmount: string
-  mode: EarnDepositMode
+  mode: EarnEnterMode
   // the below are mainly for swap-deposit. For deposit, this would just be
   // same as the depositTokenAmount and depositTokenId
   fromTokenAmount: string

From 4d01e46888b3ea83072ee208c1467226cd3e79bb Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 10:05:04 -0700
Subject: [PATCH 006/118] fix: remove unused export

---
 src/earn/prepareTransactions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index d0b5ef1326d..cf0e58dbdcc 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -165,7 +165,7 @@ export async function prepareWithdrawAndClaimTransactions({
   })
 }
 
-export async function prepareWithdrawTransactions({
+async function prepareWithdrawTransactions({
   amount,
   token,
   walletAddress,

From 73c50670d6310ac84a92e13c4c1b76d834628b62 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 17:45:05 -0700
Subject: [PATCH 007/118] fix(earn): amount TransactionWithdrawDetails display

---
 src/earn/EarnEnterAmount.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 8c4f384d354..62f9b5fc616 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -450,7 +450,7 @@ function EarnEnterAmount({ route }: Props) {
               swapTransaction={swapTransaction}
             />
           )}
-          {tokenAmount && prepareTransactionsResult && isWithdrawal && (
+          {tokenAmount && isWithdrawal && (
             <TransactionWithdrawDetails
               pool={pool}
               token={inputToken}
@@ -595,7 +595,7 @@ function TransactionWithdrawDetails({
         <View style={styles.txDetailsValue}>
           <TokenDisplay
             tokenId={token.tokenId}
-            testID="EarnEnterAmount/Deposit/Crypto"
+            testID="EarnEnterAmount/Withdraw/Fiat"
             amount={pool.balance}
             showLocalAmount={true}
             style={styles.txDetailsValueText}
@@ -603,7 +603,7 @@ function TransactionWithdrawDetails({
           <Text style={[styles.txDetailsValueText, styles.gray4]}>
             {'('}
             <TokenDisplay
-              testID="EarnEnterAmount/Deposit/Fiat"
+              testID="EarnEnterAmount/Withdraw/Crypto"
               tokenId={token.tokenId}
               amount={pool.balance}
               showLocalAmount={false}

From 364f5518822633fe3d56591edbdf71c00b224ecc Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 17:48:40 -0700
Subject: [PATCH 008/118] test(earn): earn partial withdrawal flow

---
 src/earn/EarnEnterAmount.test.tsx | 76 ++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 5564af6e585..404b32a0f5b 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,7 +6,10 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import { usePrepareDepositTransactions } from 'src/earn/prepareTransactions'
+import {
+  usePrepareDepositTransactions,
+  usePrepareWithdrawTransactions,
+} from 'src/earn/prepareTransactions'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -112,7 +115,7 @@ const store = createMockStore({
   tokens: {
     tokenBalances: {
       ...mockTokenBalances,
-      [mockArbUsdcTokenId]: {
+      mockArbUsdcTokenId: {
         ...mockTokenBalances[mockArbUsdcTokenId],
         balance: '10',
       },
@@ -376,6 +379,75 @@ describe('EarnEnterAmount', () => {
     })
   })
 
+  describe('withdraw', () => {
+    // Pool balance should be set to determine available withdrawal amount
+    const withdrawalPool = mockEarnPositions[0]
+    withdrawalPool.balance = '10'
+    const withdrawParams = { pool: withdrawalPool, mode: 'withdraw' }
+    it('should show only the withdrawal token and not include the token dropdown', async () => {
+      jest.mocked(usePrepareWithdrawTransactions).mockReturnValue({
+        prepareTransactionsResult: {
+          prepareTransactionsResult: mockPreparedTransaction,
+          swapTransaction: undefined,
+        },
+        refreshPreparedTransactions: jest.fn(),
+        clearPreparedTransactions: jest.fn(),
+        prepareTransactionError: undefined,
+        isPreparingTransactions: false,
+      })
+      const { getByTestId, queryByTestId } = render(
+        <Provider store={store}>
+          <MockedNavigator component={EarnEnterAmount} params={withdrawParams} />
+        </Provider>
+      )
+
+      expect(getByTestId('EarnEnterAmount/TokenSelect')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/TokenSelect')).toHaveTextContent('USDC')
+      expect(getByTestId('EarnEnterAmount/TokenSelect')).toBeDisabled()
+      expect(queryByTestId('downArrowIcon')).toBeFalsy()
+    })
+
+    it('should show tx details for withdrawal', async () => {
+      const { getByTestId, getByText } = render(
+        <Provider store={store}>
+          <MockedNavigator component={EarnEnterAmount} params={withdrawParams} />
+        </Provider>
+      )
+
+      fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '8')
+
+      await waitFor(() => expect(getByText('earnFlow.enterAmount.continue')).not.toBeDisabled())
+
+      expect(getByTestId('EarnEnterAmount/Withdraw/Crypto')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/Withdraw/Crypto')).toHaveTextContent('10.00 USDC')
+
+      expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toHaveTextContent('₱13.30')
+
+      expect(getByTestId('EarnEnterAmount/Fees')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/Fees')).toHaveTextContent('₱0.012')
+
+      fireEvent.press(getByText('earnFlow.enterAmount.continue'))
+
+      await waitFor(() => expect(AppAnalytics.track).toHaveBeenCalledTimes(1))
+      expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_enter_amount_continue_press, {
+        amountEnteredIn: 'token',
+        amountInUsd: '8.00',
+        networkId: NetworkId['arbitrum-sepolia'],
+        depositTokenId: mockArbUsdcTokenId,
+        providerId: mockEarnPositions[0].appId,
+        poolId: mockEarnPositions[0].positionId,
+        fromTokenId: mockArbUsdcTokenId,
+        fromTokenAmount: '8',
+        depositTokenAmount: '8',
+        mode: 'withdraw',
+      })
+
+      //TODO(ACT-1389): check navigation to withdrawal confirmation screen
+    })
+  })
+
   // tests independent of deposit / swap-deposit
   it('should show a warning and not allow the user to continue if they input an amount greater than balance', async () => {
     jest.mocked(usePrepareDepositTransactions).mockReturnValue({

From 292d7396e3c6b4a1c1dc233381b1915b66cd296b Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 18:17:18 -0700
Subject: [PATCH 009/118] chore: add feature gate for partial withdrawals

---
 src/earn/EarnPoolInfoScreen.tsx | 6 +++++-
 src/statsig/types.ts            | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
index 365dfc0b321..5489adb6f52 100644
--- a/src/earn/EarnPoolInfoScreen.tsx
+++ b/src/earn/EarnPoolInfoScreen.tsx
@@ -28,6 +28,8 @@ import type { EarningItem } from 'src/positions/types'
 import { EarnPosition } from 'src/positions/types'
 import { useDispatch, useSelector } from 'src/redux/hooks'
 import { NETWORK_NAMES } from 'src/shared/conts'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -492,7 +494,9 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
       depositTokenId: dataProps.depositTokenId,
     })
     // TODO(Tomm): is a feature flag for partial withdrawals needed?
-    const partialWithdrawalsEnabled = true
+    const partialWithdrawalsEnabled = getFeatureGate(
+      StatsigFeatureGates.ALLOW_EARN_PARTIAL_WITHDRAWAL
+    )
     if (partialWithdrawalsEnabled) {
       navigate(Screens.EarnEnterAmount, { pool, mode: 'withdraw' })
     } else {
diff --git a/src/statsig/types.ts b/src/statsig/types.ts
index ef254ac271c..9132e233342 100644
--- a/src/statsig/types.ts
+++ b/src/statsig/types.ts
@@ -41,6 +41,7 @@ export enum StatsigFeatureGates {
   SHOW_APPLE_IN_CAB = 'show_apple_in_cab',
   SHOW_SWAP_AND_DEPOSIT = 'show_swap_and_deposit',
   SHOW_UK_COMPLIANT_VARIANT = 'show_uk_compliant_variant',
+  ALLOW_EARN_PARTIAL_WITHDRAWAL = 'allow_earn_partial_withdrawal',
 }
 
 export enum StatsigExperiments {

From 87990f0cb57f838e46412f3fa439bc06235f11de Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 18:18:42 -0700
Subject: [PATCH 010/118] test(earn): partial withdrawal feature gate and
 navigation

---
 src/earn/EarnPoolInfoScreen.test.tsx | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/earn/EarnPoolInfoScreen.test.tsx b/src/earn/EarnPoolInfoScreen.test.tsx
index 1c89d973717..9d4702c9c3b 100644
--- a/src/earn/EarnPoolInfoScreen.test.tsx
+++ b/src/earn/EarnPoolInfoScreen.test.tsx
@@ -621,6 +621,32 @@ describe('EarnPoolInfoScreen', () => {
       networkId: 'arbitrum-sepolia',
       depositTokenId: mockEarnPositions[0].dataProps.depositTokenId,
     })
-    // TODO (ACT-1343): check that navigate is called with correct params
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnCollectScreen, {
+      pool: { ...mockEarnPositions[0], balance: '100' },
+    })
+  })
+
+  it('navigates to EarnEnterAmount when partial withdrawals are enabled', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation(
+        (featureGateName) => featureGateName === StatsigFeatureGates.ALLOW_EARN_PARTIAL_WITHDRAWAL
+      )
+
+    const { getByText } = render(
+      <Provider store={getStore()}>
+        <MockedNavigator
+          component={EarnPoolInfoScreen}
+          params={{
+            pool: { ...mockEarnPositions[0], balance: '100' },
+          }}
+        />
+      </Provider>
+    )
+    fireEvent.press(getByText('earnFlow.poolInfoScreen.withdraw'))
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnEnterAmount, {
+      pool: { ...mockEarnPositions[0], balance: '100' },
+      mode: 'withdraw',
+    })
   })
 })

From 6363e9f026a5727834c7c79e2844dfac8e2bb478 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Tue, 8 Oct 2024 18:22:40 -0700
Subject: [PATCH 011/118] docs: remove stray todo

---
 src/earn/EarnPoolInfoScreen.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
index 5489adb6f52..8db193ed682 100644
--- a/src/earn/EarnPoolInfoScreen.tsx
+++ b/src/earn/EarnPoolInfoScreen.tsx
@@ -493,7 +493,6 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
       networkId,
       depositTokenId: dataProps.depositTokenId,
     })
-    // TODO(Tomm): is a feature flag for partial withdrawals needed?
     const partialWithdrawalsEnabled = getFeatureGate(
       StatsigFeatureGates.ALLOW_EARN_PARTIAL_WITHDRAWAL
     )

From 345b535f57cfdb1908721c482b275d29849678bf Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 9 Oct 2024 13:51:55 -0700
Subject: [PATCH 012/118] Update test/values.ts

Co-authored-by: Finnian Jacobson-Schulte <140328381+finnian0826@users.noreply.github.com>
---
 test/values.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/values.ts b/test/values.ts
index 92445691e22..835d945d126 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -572,7 +572,7 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     priceUsd: '1.2',
     priceFetchedAt: Date.now(),
   },
-  [mockAaveArbUsdcAddress]: {
+  [mockAaveArbUsdcTokenId]: {
     name: 'Aave USDC',
     networkId: NetworkId['arbitrum-sepolia'],
     tokenId: mockAaveArbUsdcTokenId,

From 5fb98c5cd76d3022bfa8ed993404301465fe64b6 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Wed, 9 Oct 2024 15:33:33 -0700
Subject: [PATCH 013/118] refactor(earn): combine deposit and withdrawal hooks

---
 src/earn/EarnEnterAmount.test.tsx | 31 +++++++++++++-------------
 src/earn/EarnEnterAmount.tsx      | 11 ++-------
 src/earn/prepareTransactions.ts   | 37 +++++++++----------------------
 3 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 404b32a0f5b..0fade8d4224 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,10 +6,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import {
-  usePrepareDepositTransactions,
-  usePrepareWithdrawTransactions,
-} from 'src/earn/prepareTransactions'
+import { usePrepareTransactions } from 'src/earn/prepareTransactions'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -144,7 +141,7 @@ describe('EarnEnterAmount', () => {
       .mocked(getNumberFormatSettings)
       .mockReturnValue({ decimalSeparator: '.', groupingSeparator: ',' })
     store.clearActions()
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: refreshPreparedTransactionsSpy,
       clearPreparedTransactions: jest.fn(),
@@ -196,7 +193,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+      jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -325,7 +322,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+      jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: mockSwapTransaction,
@@ -384,8 +381,10 @@ describe('EarnEnterAmount', () => {
     const withdrawalPool = mockEarnPositions[0]
     withdrawalPool.balance = '10'
     const withdrawParams = { pool: withdrawalPool, mode: 'withdraw' }
-    it('should show only the withdrawal token and not include the token dropdown', async () => {
-      jest.mocked(usePrepareWithdrawTransactions).mockReturnValue({
+
+    beforeEach(() => {
+      jest.clearAllMocks()
+      jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -395,6 +394,8 @@ describe('EarnEnterAmount', () => {
         prepareTransactionError: undefined,
         isPreparingTransactions: false,
       })
+    })
+    it('should show only the withdrawal token and not include the token dropdown', async () => {
       const { getByTestId, queryByTestId } = render(
         <Provider store={store}>
           <MockedNavigator component={EarnEnterAmount} params={withdrawParams} />
@@ -450,7 +451,7 @@ describe('EarnEnterAmount', () => {
 
   // tests independent of deposit / swap-deposit
   it('should show a warning and not allow the user to continue if they input an amount greater than balance', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -473,7 +474,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show loading spinner when preparing transaction', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -546,7 +547,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should track analytics and navigate correctly when tapping cta to add gas', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransactionNotEnough,
         swapTransaction: undefined,
@@ -583,7 +584,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show the FeeDetailsBottomSheet when the user taps the fee details icon', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -608,7 +609,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show swap fees on the FeeDetailsBottomSheet when swap transaction is present', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
@@ -639,7 +640,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should display swap bottom sheet when the user taps the swap details icon', async () => {
-    jest.mocked(usePrepareDepositTransactions).mockReturnValue({
+    jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 62f9b5fc616..6c9894e78d9 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,10 +21,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import {
-  usePrepareDepositTransactions,
-  usePrepareWithdrawTransactions,
-} from 'src/earn/prepareTransactions'
+import { usePrepareTransactions } from 'src/earn/prepareTransactions'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -146,17 +143,13 @@ function EarnEnterAmount({ route }: Props) {
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
 
-  // Avoid conditionally calling hooks
-  const depositTransaction = usePrepareDepositTransactions()
-  const withdrawTransaction = usePrepareWithdrawTransactions()
-
   const {
     prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = isWithdrawal ? withdrawTransaction : depositTransaction
+  } = usePrepareTransactions(mode)
 
   const walletAddress = useSelector(walletAddressSelector)
 
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index cf0e58dbdcc..41cea7fde59 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -93,26 +93,6 @@ export async function prepareDepositTransactions({
   }
 }
 
-/**
- * Hook to prepare transactions for supplying crypto.
- */
-export function usePrepareDepositTransactions() {
-  const prepareTransactions = useAsyncCallback(prepareDepositTransactions, {
-    onError: (err) => {
-      const error = ensureError(err)
-      Logger.error(TAG, 'usePrepareDepositTransactions', error)
-    },
-  })
-
-  return {
-    prepareTransactionsResult: prepareTransactions.result,
-    refreshPreparedTransactions: prepareTransactions.execute,
-    clearPreparedTransactions: prepareTransactions.reset,
-    prepareTransactionError: prepareTransactions.error,
-    isPreparingTransactions: prepareTransactions.loading,
-  }
-}
-
 export async function prepareWithdrawAndClaimTransactions({
   pool,
   walletAddress,
@@ -214,13 +194,16 @@ async function prepareWithdrawTransactions({
   }
 }
 
-export function usePrepareWithdrawTransactions() {
-  const prepareTransactions = useAsyncCallback(prepareWithdrawTransactions, {
-    onError: (err) => {
-      const error = ensureError(err)
-      Logger.error(TAG, 'usePrepareWithdrawTransactions', error)
-    },
-  })
+export function usePrepareTransactions(mode: EarnEnterMode) {
+  const prepareTransactions = useAsyncCallback(
+    mode === 'withdraw' ? prepareWithdrawTransactions : prepareDepositTransactions,
+    {
+      onError: (err) => {
+        const error = ensureError(err)
+        Logger.error(TAG, 'usePrepareWithdrawTransactions', error)
+      },
+    }
+  )
 
   return {
     prepareTransactionsResult: prepareTransactions.result,

From 41cd62d4bcb249ebabd16be821926b34ff5d588d Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Thu, 10 Oct 2024 16:05:08 -0700
Subject: [PATCH 014/118] feat(earn): display partial withdrawals on
 confirmation screen

---
 locales/base/translation.json                 |   6 +
 ...st.tsx => EarnConfirmationScreen.test.tsx} | 132 +++++++-----------
 ...tScreen.tsx => EarnConfirmationScreen.tsx} |  91 ++++++------
 src/earn/EarnEnterAmount.tsx                  |  12 +-
 src/earn/EarnPoolInfoScreen.test.tsx          |   5 +-
 src/earn/EarnPoolInfoScreen.tsx               |   3 +-
 src/earn/types.ts                             |   2 +
 src/navigator/Navigator.tsx                   |   6 +-
 src/navigator/Screens.tsx                     |   2 +-
 src/navigator/types.tsx                       |  13 +-
 src/positions/types.ts                        |   4 +
 test/RootStateSchema.json                     |   2 +-
 test/values.ts                                |   1 +
 13 files changed, 139 insertions(+), 140 deletions(-)
 rename src/earn/{EarnCollectScreen.test.tsx => EarnConfirmationScreen.test.tsx} (64%)
 rename src/earn/{EarnCollectScreen.tsx => EarnConfirmationScreen.tsx} (86%)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 90252fbcf58..b3102a655af 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2620,12 +2620,18 @@
     },
     "collect": {
       "title": "Congratulations! Review & collect your earnings",
+      "titleClaim": "You’re going to claim:",
+      "titleCollect": "You’re going to collect:",
+      "titleWithdraw": "You’re going to withdraw:",
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Rate (est.)",
       "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
       "cta": "Collect Earnings",
+      "ctaWithdraw": "Withdraw",
+      "ctaReward": "Claim Reward",
+      "ctaExit": "Exit Pool",
       "errorTitle": "Something went wrong",
       "errorDescription": "Unable to fetch deposit details. Please try again.",
       "noGasTitle": "You need more {{symbol}} to continue",
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
similarity index 64%
rename from src/earn/EarnCollectScreen.test.tsx
rename to src/earn/EarnConfirmationScreen.test.tsx
index 2b69aa18a04..52cf1950c38 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
-import EarnCollectScreen from 'src/earn/EarnCollectScreen'
+import EarnConfirmationScreen from 'src/earn/EarnConfirmationScreen'
 import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
 import { withdrawStart } from 'src/earn/slice'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
@@ -16,11 +16,10 @@ import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
+import { createMockStore } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
   mockAaveArbUsdcTokenId,
-  mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
   mockArbUsdcTokenId,
@@ -86,7 +85,7 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
   },
 }
 
-describe('EarnCollectScreen', () => {
+describe('EarnConfirmationScreen', () => {
   beforeEach(() => {
     jest.clearAllMocks()
 
@@ -100,52 +99,6 @@ describe('EarnCollectScreen', () => {
     store.clearActions()
   })
 
-  it('renders total balance, rewards, apy and gas after fetching rewards and preparing tx', async () => {
-    const { getByText, getByTestId, queryByTestId } = render(
-      <Provider store={store}>
-        <MockedNavigator
-          component={EarnCollectScreen}
-          params={{
-            pool: mockEarnPositions[0],
-          }}
-        />
-      </Provider>
-    )
-
-    expect(getByText('earnFlow.collect.title')).toBeTruthy()
-    expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
-      '11.83 USDC'
-    )
-    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent('₱15.73')
-    expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
-    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
-
-    expect(getByText('earnFlow.collect.plus')).toBeTruthy()
-    expect(getByTestId(`EarnCollect/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
-      '0.01 ARB'
-    )
-    expect(getByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent('₱0.016')
-    expect(getByText('earnFlow.collect.apy, {"apy":"1.92"}')).toBeTruthy()
-
-    await waitFor(() => {
-      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
-    })
-    expect(getByTestId('EarnCollect/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
-    expect(getByTestId('EarnCollect/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
-    expect(queryByTestId('EarnCollect/GasSubsidized')).toBeFalsy()
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
-    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
-      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
-      pool: mockEarnPositions[0],
-      rewardsPositions: [mockRewardsPositions[1]],
-      walletAddress: mockAccount.toLowerCase(),
-      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
-    })
-    expect(store.getActions()).toEqual([])
-  })
-
   it('skips rewards section when no rewards', async () => {
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider
@@ -161,30 +114,33 @@ describe('EarnCollectScreen', () => {
         })}
       >
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
+    expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
       '11.83 USDC'
     )
-    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent('₱15.73')
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
+      '₱15.73'
+    )
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
-    expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
-    expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toBeFalsy()
+    expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
+    expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toBeFalsy()
     await waitFor(() => {
-      expect(queryByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+      expect(queryByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
     })
     await waitFor(() => {
-      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
     })
   })
 
@@ -195,25 +151,26 @@ describe('EarnCollectScreen', () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
-      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
     })
     expect(getByText('earnFlow.collect.errorTitle')).toBeTruthy()
-    expect(getByTestId('EarnCollect/GasError')).toBeTruthy()
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnConfirmation/GasError')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
   })
 
   it('disables cta if not enough balance for gas', async () => {
@@ -224,43 +181,45 @@ describe('EarnCollectScreen', () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
-      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
     })
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
-    expect(getByTestId('EarnCollect/GasError')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnConfirmation/GasError')).toBeTruthy()
   })
 
   it('pressing cta dispatches withdraw action and fires analytics event', async () => {
     const { getByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
     await waitFor(() => {
-      expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+      expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
     })
 
-    fireEvent.press(getByTestId('EarnCollectScreen/CTA'))
+    fireEvent.press(getByTestId('EarnConfirmationScreen/CTA'))
 
     expect(store.getActions()).toEqual([
       {
@@ -296,20 +255,23 @@ describe('EarnCollectScreen', () => {
     const { getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
     await waitFor(() => {
-      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
     })
 
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
-    expect(getByTestId('EarnCollectScreen/CTA')).toContainElement(getByTestId('Button/Loading'))
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toContainElement(
+      getByTestId('Button/Loading')
+    )
   })
 
   it('navigate and fire analytics on no gas CTA press', async () => {
@@ -321,16 +283,17 @@ describe('EarnCollectScreen', () => {
     const { getByText, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
 
     await waitFor(() => {
-      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+      expect(queryByTestId('EarnConfirmation/RewardsLoading')).toBeFalsy()
     })
 
     expect(
@@ -360,13 +323,14 @@ describe('EarnCollectScreen', () => {
     const { getByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
-          component={EarnCollectScreen}
+          component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
+            mode: 'collect',
           }}
         />
       </Provider>
     )
-    expect(getByTestId('EarnCollect/GasSubsidized')).toBeTruthy()
+    expect(getByTestId('EarnConfirmation/GasSubsidized')).toBeTruthy()
   })
 })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
similarity index 86%
rename from src/earn/EarnCollectScreen.tsx
rename to src/earn/EarnConfirmationScreen.tsx
index ff133e5d72e..475e035ded0 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -13,6 +13,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { usePrepareWithdrawAndClaimTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
+import { OutletMode } from 'src/earn/types'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
@@ -33,12 +34,12 @@ import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactio
 import { walletAddressSelector } from 'src/web3/selectors'
 import { isAddress } from 'viem'
 
-type Props = NativeStackScreenProps<StackParamList, Screens.EarnCollectScreen>
+type Props = NativeStackScreenProps<StackParamList, Screens.EarnConfirmationScreen>
 
-export default function EarnCollectScreen({ route }: Props) {
+export default function EarnConfirmationScreen({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
-  const { pool } = route.params
+  const { pool, mode, inputAmount } = route.params
   const { depositTokenId, withdrawTokenId, rewardsPositionIds } = pool.dataProps
   const withdrawStatus = useSelector(withdrawStatusSelector)
   const rewardsPositions = useSelector(positionsWithBalanceSelector).filter((position) =>
@@ -68,6 +69,7 @@ export default function EarnCollectScreen({ route }: Props) {
 
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
 
+  // TODO(tomm): this should handle partial withdrawals
   const {
     result: prepareTransactionsResult,
     loading: isPreparingTransactions,
@@ -81,8 +83,12 @@ export default function EarnCollectScreen({ route }: Props) {
   })
 
   const withdrawAmountInDepositToken = useMemo(() => {
-    return withdrawToken.balance.multipliedBy(pool.pricePerShare[0] ?? 1)
-  }, [withdrawToken, pool.pricePerShare])
+    if (inputAmount) {
+      return new BigNumber(inputAmount).multipliedBy(pool.pricePerShare[0] ?? 1)
+    } else {
+      return withdrawToken.balance.multipliedBy(pool.pricePerShare[0] ?? 1)
+    }
+  }, [withdrawToken, pool.pricePerShare, inputAmount])
 
   const onPress = () => {
     if (prepareTransactionsResult?.type !== 'possible') {
@@ -138,7 +144,7 @@ export default function EarnCollectScreen({ route }: Props) {
   return (
     <SafeAreaView style={styles.container}>
       <ScrollView contentContainerStyle={styles.contentContainer}>
-        <Text style={styles.title}>{t('earnFlow.collect.title')}</Text>
+        <Title pool={pool} mode={mode} />
         <View style={styles.collectInfoContainer}>
           <CollectItem
             title={t('earnFlow.collect.total')}
@@ -154,12 +160,11 @@ export default function EarnCollectScreen({ route }: Props) {
             />
           ))}
           <View style={styles.separator} />
-          <Rate pool={pool} />
           <View>
             <Text style={styles.rateText}>{t('earnFlow.collect.fee')}</Text>
             {feeSection}
             {isGasSubsidized && (
-              <Text style={styles.gasSubsidized} testID={'EarnCollect/GasSubsidized'}>
+              <Text style={styles.gasSubsidized} testID={'EarnConfirmation/GasSubsidized'}>
                 {t('earnFlow.gasSubsidized')}
               </Text>
             )}
@@ -203,13 +208,18 @@ export default function EarnCollectScreen({ route }: Props) {
           />
         )}
       </ScrollView>
-
       <Button
         style={styles.button}
         size={BtnSizes.FULL}
-        text={t('earnFlow.collect.cta')}
+        text={
+          mode === 'withdraw'
+            ? t('earnFlow.collect.ctaWithdraw')
+            : mode === 'exit'
+              ? t('earnFlow.collect.ctaExit')
+              : t('earnFlow.collect.ctaReward')
+        }
         onPress={onPress}
-        testID="EarnCollectScreen/CTA"
+        testID="EarnConfirmationScreen/CTA"
         disabled={!!ctaDisabled}
         showLoading={withdrawStatus === 'loading'}
       />
@@ -239,14 +249,14 @@ function CollectItem({
             tokenId={tokenInfo.tokenId}
             amount={rewardAmount}
             showLocalAmount={false}
-            testID={`EarnCollect/${tokenInfo.tokenId}/CryptoAmount`}
+            testID={`EarnConfirmation/${tokenInfo.tokenId}/CryptoAmount`}
           />
           <TokenDisplay
             style={styles.fiatText}
             tokenId={tokenInfo.tokenId}
             amount={rewardAmount}
             showLocalAmount={true}
-            testID={`EarnCollect/${tokenInfo.tokenId}/FiatAmount`}
+            testID={`EarnConfirmation/${tokenInfo.tokenId}/FiatAmount`}
           />
         </View>
       </View>
@@ -254,35 +264,9 @@ function CollectItem({
   )
 }
 
-function Rate({ pool }: { pool: EarnPosition }) {
-  const { t } = useTranslation()
-  const { depositTokenId } = pool.dataProps
-  const depositToken = useTokenInfo(depositTokenId)!
-  const apy = pool.dataProps.yieldRates.find((rate) => rate.tokenId === depositTokenId)
-
-  return (
-    <View>
-      <Text style={styles.rateText}>{t('earnFlow.collect.rate')}</Text>
-      <View style={styles.row}>
-        <TokenIcon token={depositToken} size={IconSize.SMALL} />
-
-        {apy ? (
-          <Text style={styles.apyText}>
-            {t('earnFlow.collect.apy', {
-              apy: apy.percentage.toFixed(2),
-            })}
-          </Text>
-        ) : (
-          <Text style={styles.apyText}>{t('earnFlow.collect.apy', { apy: '--' })}</Text>
-        )}
-      </View>
-    </View>
-  )
-}
-
 function GasFeeError() {
   return (
-    <View testID="EarnCollect/GasError">
+    <View testID="EarnConfirmation/GasError">
       <Text style={styles.apyText}> -- </Text>
       <Text style={styles.gasFeeFiat}> -- </Text>
     </View>
@@ -291,7 +275,7 @@ function GasFeeError() {
 
 function GasFeeLoading() {
   return (
-    <View testID="EarnCollect/GasLoading">
+    <View testID="EarnConfirmation/GasLoading">
       <SkeletonPlaceholder backgroundColor={Colors.gray2} highlightColor={Colors.white}>
         <View style={styles.gasFeeCryptoLoading} />
       </SkeletonPlaceholder>
@@ -318,7 +302,7 @@ function GasFee({
         tokenId={feeCurrency.tokenId}
         amount={maxFeeAmount}
         showLocalAmount={false}
-        testID="EarnCollect/GasFeeCryptoAmount"
+        testID="EarnConfirmation/GasFeeCryptoAmount"
       />
       {!isGasSubsidized && (
         <TokenDisplay
@@ -326,13 +310,34 @@ function GasFee({
           tokenId={feeCurrency.tokenId}
           amount={maxFeeAmount}
           showLocalAmount={true}
-          testID="EarnCollect/GasFeeFiatAmount"
+          testID="EarnConfirmation/GasFeeFiatAmount"
         />
       )}
     </>
   )
 }
 
+// TODO: add fallback title for when claimType is not earnings or rewards
+function Title({ pool, mode }: { pool: EarnPosition; mode: OutletMode }) {
+  const { t } = useTranslation()
+  return (
+    <>
+      {mode === 'withdraw' ? (
+        <Text style={styles.title}>{t('earnFlow.collect.titleWithdraw')}</Text>
+      ) : (
+        <>
+          {pool.dataProps.claimType === 'earnings' && (
+            <Text style={styles.title}>{t('earnFlow.collect.titleClaim')}</Text>
+          )}
+          {pool.dataProps.claimType === 'rewards' && (
+            <Text style={styles.title}>{t('earnFlow.collect.titleCollect')}</Text>
+          )}
+        </>
+      )}
+    </>
+  )
+}
+
 const styles = StyleSheet.create({
   contentContainer: {
     padding: Spacing.Thick24,
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 6c9894e78d9..fb3b330e5f7 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -360,8 +360,16 @@ function EarnEnterAmount({ route }: Props) {
         ? getSwapToAmountInDecimals({ swapTransaction, fromAmount: tokenAmount }).toString()
         : tokenAmount.toString(),
     })
-    // TODO(ACT-1389) if mode === 'withdraw' navigate to EarnConfirmationScreen
-    reviewBottomSheetRef.current?.snapToIndex(0)
+
+    if (mode === 'withdraw') {
+      navigate(Screens.EarnConfirmationScreen, {
+        pool,
+        mode,
+        inputAmount: tokenAmount.toString(),
+      })
+    } else {
+      reviewBottomSheetRef.current?.snapToIndex(0)
+    }
   }
 
   const dropdownEnabled = useMemo(() => {
diff --git a/src/earn/EarnPoolInfoScreen.test.tsx b/src/earn/EarnPoolInfoScreen.test.tsx
index 9d4702c9c3b..a4f5168bbce 100644
--- a/src/earn/EarnPoolInfoScreen.test.tsx
+++ b/src/earn/EarnPoolInfoScreen.test.tsx
@@ -602,7 +602,7 @@ describe('EarnPoolInfoScreen', () => {
     expect(getByTestId('Earn/BeforeDepositBottomSheet/Transfer')).toBeTruthy()
   })
 
-  it('navigate to EarnCollectScreen when Withdraw button is tapped', () => {
+  it('navigate to EarnConfirmationScreen when Withdraw button is tapped', () => {
     const { getByText } = render(
       <Provider store={getStore()}>
         <MockedNavigator
@@ -621,8 +621,9 @@ describe('EarnPoolInfoScreen', () => {
       networkId: 'arbitrum-sepolia',
       depositTokenId: mockEarnPositions[0].dataProps.depositTokenId,
     })
-    expect(navigate).toHaveBeenCalledWith(Screens.EarnCollectScreen, {
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
       pool: { ...mockEarnPositions[0], balance: '100' },
+      mode: 'withdraw',
     })
   })
 
diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
index 8db193ed682..9db581074e3 100644
--- a/src/earn/EarnPoolInfoScreen.tsx
+++ b/src/earn/EarnPoolInfoScreen.tsx
@@ -486,6 +486,7 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
   } = useDepositEntrypointInfo({ allTokens, pool })
 
   const onPressWithdraw = () => {
+    // TODO(tomm): once act-1385 is merge use the bottom sheet button presses
     AppAnalytics.track(EarnEvents.earn_pool_info_tap_withdraw, {
       poolId: positionId,
       providerId: appId,
@@ -499,7 +500,7 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
     if (partialWithdrawalsEnabled) {
       navigate(Screens.EarnEnterAmount, { pool, mode: 'withdraw' })
     } else {
-      navigate(Screens.EarnCollectScreen, { pool })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'withdraw' })
     }
   }
 
diff --git a/src/earn/types.ts b/src/earn/types.ts
index aed23697f05..457076fde44 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -65,3 +65,5 @@ export interface BeforeDepositAction {
 }
 
 export type EarnEnterMode = 'deposit' | 'swap-deposit' | 'withdraw'
+
+export type OutletMode = 'withdraw' | 'collect' | 'exit'
diff --git a/src/navigator/Navigator.tsx b/src/navigator/Navigator.tsx
index 7a6096d0fd4..345d7130a0e 100644
--- a/src/navigator/Navigator.tsx
+++ b/src/navigator/Navigator.tsx
@@ -32,7 +32,7 @@ import BackupQuiz, { navOptionsForQuiz } from 'src/backup/BackupQuiz'
 import DappShortcutTransactionRequest from 'src/dapps/DappShortcutTransactionRequest'
 import DappShortcutsRewards from 'src/dapps/DappShortcutsRewards'
 import DappsScreen from 'src/dapps/DappsScreen'
-import EarnCollectScreen from 'src/earn/EarnCollectScreen'
+import EarnConfirmationScreen from 'src/earn/EarnConfirmationScreen'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
 import EarnHome from 'src/earn/EarnHome'
 import EarnInfoScreen from 'src/earn/EarnInfoScreen'
@@ -543,8 +543,8 @@ const earnScreens = (Navigator: typeof Stack) => (
   <>
     <Navigator.Screen name={Screens.EarnHome} component={EarnHome} options={headerWithBackButton} />
     <Navigator.Screen
-      name={Screens.EarnCollectScreen}
-      component={EarnCollectScreen}
+      name={Screens.EarnConfirmationScreen}
+      component={EarnConfirmationScreen}
       options={headerWithBackButton}
     />
     <Navigator.Screen
diff --git a/src/navigator/Screens.tsx b/src/navigator/Screens.tsx
index ea7a72741b3..d6940e0909f 100644
--- a/src/navigator/Screens.tsx
+++ b/src/navigator/Screens.tsx
@@ -17,7 +17,7 @@ export enum Screens {
   DebugImages = 'DebugImages',
   EarnInfoScreen = 'EarnInfoScreen',
   EarnEnterAmount = 'EarnEnterAmount',
-  EarnCollectScreen = 'EarnCollectScreen',
+  EarnConfirmationScreen = 'EarnConfirmationScreen',
   EarnHome = 'EarnHome',
   EarnPoolInfoScreen = 'EarnPoolInfoScreen',
   EnableBiometry = 'EnableBiometry',
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 41b83262418..ff3dc96d117 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -1,6 +1,6 @@
 import { KycSchema } from '@fiatconnect/fiatconnect-types'
 import { SendOrigin, WalletConnectPairingOrigin } from 'src/analytics/types'
-import { EarnEnterMode, EarnTabType } from 'src/earn/types'
+import { EarnEnterMode, EarnTabType, OutletMode } from 'src/earn/types'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
 import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
@@ -79,8 +79,15 @@ export type StackParamList = {
   [Screens.DappsScreen]: undefined
   [Screens.DebugImages]: undefined
   [Screens.EarnInfoScreen]: undefined
-  [Screens.EarnEnterAmount]: { pool: EarnPosition; mode?: EarnEnterMode }
-  [Screens.EarnCollectScreen]: { pool: EarnPosition }
+  [Screens.EarnEnterAmount]: {
+    pool: EarnPosition
+    mode?: EarnEnterMode
+  }
+  [Screens.EarnConfirmationScreen]: {
+    pool: EarnPosition
+    mode: OutletMode
+    inputAmount?: string
+  }
   [Screens.EarnHome]: { activeEarnTab?: EarnTabType } | undefined
   [Screens.EarnPoolInfoScreen]: { pool: EarnPosition }
   [Screens.ErrorScreen]: {
diff --git a/src/positions/types.ts b/src/positions/types.ts
index 4be9164973d..72a5786da35 100644
--- a/src/positions/types.ts
+++ b/src/positions/types.ts
@@ -36,9 +36,13 @@ interface EarnDataProps {
   depositTokenId: string
   withdrawTokenId: string
   rewardsPositionIds?: string[]
+  claimType?: ClaimType
+  withdrawalIncludesClaim?: boolean
   // We'll add more fields here as needed
 }
 
+export type ClaimType = 'earnings' | 'rewards'
+
 export type EarnPosition = AppTokenPosition & { dataProps: EarnDataProps }
 
 export type TokenCategory = 'claimable'
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 036ca3530c7..677f42ce830 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -3460,7 +3460,7 @@
                 "DappShortcutsRewards",
                 "DappsScreen",
                 "DebugImages",
-                "EarnCollectScreen",
+                "EarnConfirmationScreen",
                 "EarnEnterAmount",
                 "EarnHome",
                 "EarnInfoScreen",
diff --git a/test/values.ts b/test/values.ts
index 835d945d126..03c6cbde747 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -1781,6 +1781,7 @@ export const mockEarnPositions: EarnPosition[] = [
       rewardsPositionIds: [
         'arbitrum-sepolia:0x460b97bd498e1157530aeb3086301d5225b91216:supply-incentives',
       ],
+      claimType: 'earnings',
     },
     tokens: [
       {

From 96caa2ecab28c46c617d3df73fecbcb148fed53b Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 10:01:25 -0700
Subject: [PATCH 015/118] fix(earn): use correct token amounts

---
 src/earn/EarnEnterAmount.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 6c9894e78d9..e39d6cc9557 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -199,11 +199,11 @@ function EarnEnterAmount({ route }: Props) {
 
   const tokenToLocal = useTokenToLocalAmount(
     parsedTokenAmount,
-    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
+    isWithdrawal ? withdrawToken.tokenId : inputToken.tokenId
   )
   const localToToken = useLocalToTokenAmount(
     parsedLocalAmount,
-    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
+    isWithdrawal ? withdrawToken.tokenId : inputToken.tokenId
   )
 
   const { tokenAmount } = useMemo(() => {

From 584acfbe3dadf0405ebdee8ef29192232de4011a Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 10:41:58 -0700
Subject: [PATCH 016/118] fix(earn): disable continue when transaction is not
 possible

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index e39d6cc9557..0e6b16e18b6 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -279,7 +279,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const disabled =
     // Should disable if the user enters 0, has enough balance but the transaction is not possible, or does not have enough balance
-    !!tokenAmount?.isZero() || (!isWithdrawal && !transactionIsPossible)
+    !!tokenAmount?.isZero() || !transactionIsPossible
 
   const onTokenAmountInputChange = (value: string) => {
     setMaxPressed(false)

From 41965058d4ae86e34e123cf5528867986cede2d0 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 11:10:47 -0700
Subject: [PATCH 017/118] style(earn): use transactionToken instead of
 isWithdrawal ternaries

---
 src/earn/EarnEnterAmount.tsx | 49 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 0e6b16e18b6..6f731111609 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -112,6 +112,9 @@ function EarnEnterAmount({ route }: Props) {
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableFromTokens[0])
   const [withdrawToken, _setWithdrawToken] = useState<TokenBalance>(() => withdrawTokens[0])
+  const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
+    isWithdrawal ? withdrawToken : inputToken
+  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -197,14 +200,8 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(
-    parsedTokenAmount,
-    isWithdrawal ? withdrawToken.tokenId : inputToken.tokenId
-  )
-  const localToToken = useLocalToTokenAmount(
-    parsedLocalAmount,
-    isWithdrawal ? withdrawToken.tokenId : inputToken.tokenId
-  )
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, transactionToken.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, transactionToken.tokenId)
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
@@ -231,13 +228,18 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode, withdrawToken])
+  }, [
+    tokenAmountInput,
+    localAmountInput,
+    enteredIn,
+    inputToken,
+    mode,
+    withdrawToken,
+    transactionToken,
+  ])
 
   const feeCurrencies = useSelector((state) =>
-    feeCurrenciesSelector(
-      state,
-      mode === 'withdraw' ? withdrawToken.networkId : inputToken.networkId
-    )
+    feeCurrenciesSelector(state, transactionToken.networkId)
   )
 
   useEffect(() => {
@@ -246,27 +248,22 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(isWithdrawal ? withdrawToken.balance : inputToken.balance)
+      tokenAmount.isGreaterThan(transactionToken.balance)
     ) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(
-        tokenAmount,
-        isWithdrawal ? withdrawToken : inputToken,
-        feeCurrencies
-      )
+      return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, inputToken, mode, withdrawToken, feeCurrencies])
+  }, [tokenAmount, inputToken, mode, withdrawToken, transactionToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
-  const isAmountLessThanBalance =
-    mode === 'withdraw'
-      ? tokenAmount && tokenAmount.lte(pool.balance)
-      : tokenAmount && tokenAmount.lte(inputToken.balance)
+  const isAmountLessThanBalance = isWithdrawal
+    ? tokenAmount && tokenAmount.lte(pool.balance)
+    : tokenAmount && tokenAmount.lte(inputToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -360,7 +357,7 @@ function EarnEnterAmount({ route }: Props) {
         ? getSwapToAmountInDecimals({ swapTransaction, fromAmount: tokenAmount }).toString()
         : tokenAmount.toString(),
     })
-    // TODO(ACT-1389) if mode === 'withdraw' navigate to EarnConfirmationScreen
+    // TODO(ACT-1389) if isWithdrawal === true navigate to EarnConfirmationScreen
     reviewBottomSheetRef.current?.snapToIndex(0)
   }
 
@@ -420,7 +417,7 @@ function EarnEnterAmount({ route }: Props) {
                 testID="EarnEnterAmount/LocalAmountInput"
                 editable={!!inputToken.priceUsd}
               />
-              {(isWithdrawal ? !withdrawToken.balance.isZero() : !inputToken.balance.isZero()) && (
+              {!transactionToken.balance.isZero() && (
                 <Touchable
                   borderRadius={MAX_BORDER_RADIUS}
                   onPress={onMaxAmountPress}

From 6701f0a4d0c7f9de2d194b7f56f54e84e4295170 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 11:45:07 -0700
Subject: [PATCH 018/118] Merge branch 'tomm/act-1386' into 'tomm/act-1389'

---
 knip.ts                                       |   6 +-
 locales/de/translation.json                   |  10 +-
 locales/pl-PL/translation.json                |   8 +-
 locales/ru-RU/translation.json                |  12 +-
 locales/tr-TR/translation.json                |  12 +-
 locales/uk-UA/translation.json                |   8 +-
 locales/zh-CN/translation.json                |   6 +-
 package.json                                  |   2 +-
 scripts/update_root_state_schema.sh           |   2 +-
 src/earn/EarnEnterAmount.tsx                  |  51 ++-
 src/earn/EarnPoolInfoScreen.tsx               |  27 +-
 src/redux/api.ts                              |   9 +
 src/redux/apiReducersList.ts                  |   9 +
 src/redux/migrations.ts                       |   1 +
 src/redux/reducers.ts                         |  62 +---
 src/redux/reducersForSchemaGeneration.ts      |  20 ++
 src/redux/reducersList.ts                     |  55 +++
 src/redux/store.test.ts                       |  24 +-
 src/redux/store.ts                            |  19 +-
 src/swap/SwapScreen.test.tsx                  |   6 +
 src/transactions/NoActivity.tsx               |   6 +-
 src/transactions/api.ts                       |  29 ++
 src/transactions/apiTestHelpers.ts            |  52 +++
 .../feed/TransactionFeedV2.test.tsx           | 323 +++++++++++++++++
 src/transactions/feed/TransactionFeedV2.tsx   | 325 ++++++++++++++++++
 src/transactions/reducer.ts                   |   3 +-
 src/transactions/types.ts                     |   2 +
 src/transactions/utils.ts                     |  11 +-
 test/schema.test.ts                           |   2 +-
 test/schemas.ts                               |  10 +-
 test/utils.ts                                 |   3 +
 yarn.lock                                     |  18 +-
 32 files changed, 985 insertions(+), 148 deletions(-)
 create mode 100644 src/redux/api.ts
 create mode 100644 src/redux/apiReducersList.ts
 create mode 100644 src/redux/reducersForSchemaGeneration.ts
 create mode 100644 src/redux/reducersList.ts
 create mode 100644 src/transactions/api.ts
 create mode 100644 src/transactions/apiTestHelpers.ts
 create mode 100644 src/transactions/feed/TransactionFeedV2.test.tsx
 create mode 100644 src/transactions/feed/TransactionFeedV2.tsx

diff --git a/knip.ts b/knip.ts
index a98c0772e79..fb3ef278f92 100644
--- a/knip.ts
+++ b/knip.ts
@@ -33,7 +33,11 @@ const config: KnipConfig = {
     '@types/jest',
     'husky',
   ],
-  ignore: ['src/utils/inputValidation.ts', 'src/utils/country.json'],
+  ignore: [
+    'src/utils/inputValidation.ts',
+    'src/utils/country.json',
+    'src/redux/reducersForSchemaGeneration.ts',
+  ],
 }
 
 export default config
diff --git a/locales/de/translation.json b/locales/de/translation.json
index 89fae55fdef..823ad2010f6 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -2505,7 +2505,7 @@
       }
     },
     "cta": {
-      "title": "Verdiene mit deiner Kryptowährung",
+      "title": "Verdiene mit deiner Krypto",
       "subtitle": "Zahle heute ein und verdiene Rendite",
       "description": "Erfahre, wie viel du an der Bereitstellung eines Kreditpools verdienen kannst"
     },
@@ -2546,9 +2546,9 @@
       "description": "Verdiene etwa {{apy}}% pro Jahr, wenn du {{symbol}} zu einem Pool hinzufügst"
     },
     "entrypoint": {
-      "title": "Verdiene mit deiner Kryptowährung",
+      "title": "Verdiene mit deiner Krypto",
       "subtitle": "Einzahlen und verdienen",
-      "description": "Verdiene an deinem Krypto-Vermögen, wenn du es über einen Liquiditätspool ausleihst"
+      "description": "Verdiene an deinem Krypto-Vermögen, indem du es über einen Liquiditätspool anderen leihst"
     },
     "enterAmount": {
       "title": "Wie viel möchtest du einzahlen?",
@@ -2608,7 +2608,7 @@
       "network": "Netzwerk",
       "footer": "Wenn du Kryptowährungen in einen Aave-Pool einzahlst, akzeptierst du die mit der Nutzung von Aave verbundenen Risiken. <0>Allgemeine Nutzungsbedingungen</0>",
       "footerV1_93": "Indem du Krypto in einen {{providerName}}-Pool einzahlst, akzeptierst du die Risiken, die mit der Nutzung von {{providerName}} verbunden sind. <0>Allgemeine Nutzungsbedingungen</0>",
-      "noTermsUrlFooter": "Du bist für deine Handlungen auf {{appName}}verantwortlich. {{appName}} lehnt jede Verantwortung für dein Vermögen oder deine Interaktionen mit {{providerName}}ab. Du kannst die Dokumente von {{providerName}}<0>hier</0> und unsere Allgemeinen Geschäftsbedingungen <1>hier</1> einsehen.",
+      "noTermsUrlFooter": "Du bist für deine Handlungen in {{appName}} verantwortlich. {{appName}} lehnt jede Verantwortung für dein Vermögen oder deine Interaktionen mit {{providerName}} ab. Du kannst die Dokumente von {{providerName}} <0>hier</0> und unsere allgemeinen Geschäftsbedingungen <1>hier</1> einsehen.",
       "primaryCta": "Abschließen",
       "secondaryCta": "Abbrechen",
       "yieldRate": "Rendite (geschätzt)",
@@ -2666,7 +2666,7 @@
         "chooseDescription": "Jede finanzielle Entscheidung ist individuell. Wir haben einige Pools aus verschiedenen Protokollen zusammengefasst, jeder Pool hat jedoch seine Vorteile und Risiken. Wir tun unser Bestes, um einige hilfreiche Informationen zu jedem Pool bereitzustellen, aber es ist immer ratsam, zusätzliche Recherchen anzustellen, wenn du unsicher bist."
       },
       "noPoolsTitle": "Du bist noch keinen Pools beigetreten",
-      "noPoolsDescription": "Entdecke die verfügbaren Pools, wähle einen, der zu deinen Zielen passt, und mache das Beste aus deiner Kryptowährung.",
+      "noPoolsDescription": "Entdecke verfügbare Pools, wähle einen Pool aus, der zu deinen Zielen passt, und hole das Maximum aus deiner Krypto heraus.",
       "errorTitle": "Pools können nicht geladen werden",
       "errorDescription": "Ups, beim Laden der Pool-Informationen ist etwas schiefgelaufen. Bitte versuche es erneut.",
       "errorButton": "Erneut versuchen"
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 66a5e08fdf5..8965f46472b 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -2514,7 +2514,7 @@
       "description": "Zobacz, ile możesz zarobić, zasilając pulę pożyczkową"
     },
     "earnInfo": {
-      "title": "Zarabiaj na swojej kryptowalucie\n",
+      "title": "Zarabiaj na swoich kryptowalutach",
       "details": {
         "earn": {
           "titleGasSubsidy": "Maksymalizuj zarobki bez opłat za gaz*",
@@ -2552,7 +2552,7 @@
     "entrypoint": {
       "title": "Zarabiaj na swoich kryptowalutach",
       "subtitle": "Wpłacaj i zarabiaj",
-      "description": "Zarabiaj na swoich aktywach kryptograficznych, udzielając pożyczek za pośrednictwem puli płynności."
+      "description": "Zarabiaj na swoich kryptowalutach, pożyczając za pośrednictwem puli płynności"
     },
     "enterAmount": {
       "title": "Ile chcesz wpłacić?",
@@ -2612,7 +2612,7 @@
       "network": "Sieć",
       "footer": "Wpłacając kryptowaluty do puli Aave, akceptujesz ryzyko związane z korzystaniem z Aave. <0>Warunki</0>",
       "footerV1_93": "Wpłacając kryptowaluty do puli {{providerName}}, akceptujesz ryzyko związane z korzystaniem z {{providerName}}. <0>Warunki</0>",
-      "noTermsUrlFooter": "Ponosisz odpowiedzialność za swoje działania w {{appName}}. {{appName}} zrzeka się wszelkiej odpowiedzialności za Twoje zasoby lub interakcje z {{providerName}}. Możesz zapoznać się z dokumentami {{providerName}}<0>tutaj</0> i naszym Regulaminem <1>tutaj</1>.",
+      "noTermsUrlFooter": "Ponosisz odpowiedzialność za swoje działania w aplikacji {{appName}}. Producent aplikacji {{appName}} zrzeka się wszelkiej odpowiedzialności za Twoje aktywa lub interakcje z dostawcą {{providerName}}. Możesz zapoznać się z dokumentami dostawcy {{providerName}} <0>tutaj</0>, a naszymi warunkami <1>tutaj</1>.",
       "primaryCta": "Zakończ",
       "secondaryCta": "Anuluj",
       "yieldRate": "Stopa zwrotu (szac.)",
@@ -2670,7 +2670,7 @@
         "chooseDescription": "Każda decyzja finansowa jest osobistym wyborem. Zebraliśmy wybrane pule z różnych protokołów, ale każda pula zapewnia inne korzyści i wiąże się z innym ryzykiem. Dokładamy wszelkich starań, aby zapewnić przydatne informacje o wszystkich pulach, ale lepiej zrobić własne rozeznanie w razie jakichkolwiek wątpliwości."
       },
       "noPoolsTitle": "Nie dołączono jeszcze do żadnej puli",
-      "noPoolsDescription": "Odkryj dostępne pule, wybierz taką, która odpowiada Twoim celom i w pełni wykorzystaj swoje kryptowaluty.",
+      "noPoolsDescription": "Odkryj dostępne pule, wybierz taką, która odpowiada Twoim celom, i w pełni wykorzystaj swoje kryptowaluty.",
       "errorTitle": "Nie można wczytać pul",
       "errorDescription": "Wystąpił błąd podczas próby wczytania informacji o puli. Spróbuj ponownie.",
       "errorButton": "Spróbuj ponownie"
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index fa918ef99b6..f49fad08f43 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -2509,12 +2509,12 @@
       }
     },
     "cta": {
-      "title": "Заработай на своей криптовалюте",
+      "title": "Заработайте на своей криптовалюте",
       "subtitle": "Депонируйте сегодня и получайте доходы",
       "description": "Узнайте, сколько можете заработать при предоставлении кредитного пула"
     },
     "earnInfo": {
-      "title": "Заработай на своей криптовалюте\n",
+      "title": "Заработайте на своей\nкриптовалюте",
       "details": {
         "earn": {
           "titleGasSubsidy": "Увеличьте доходы без комиссий за газ*",
@@ -2550,9 +2550,9 @@
       "description": "Зарабатывайте примерно {{apy}}% в год при добавлении {{symbol}} в пул"
     },
     "entrypoint": {
-      "title": "Заработай на своей криптовалюте",
+      "title": "Заработайте на своей криптовалюте",
       "subtitle": "Пополняйте и зарабатывайте",
-      "description": "Зарабатывай на своих криптоактивах, когда выдаешь займы через пул ликвидности."
+      "description": "Зарабатывайте на своих криптоактивах, давая взаймы через пул ликвидности"
     },
     "enterAmount": {
       "title": "Сколько вы бы хотели внести?",
@@ -2612,7 +2612,7 @@
       "network": "Сообщество",
       "footer": "Депонируя криптовалюту в пул Aave, вы принимаешь риски, связанные с использованием Aave. <0>Положения и условия</0>",
       "footerV1_93": "Внося криптовалюту на счет в пуле {{providerName}}, вы принимаете риски, связанные с использованием {{providerName}}. <0>Положения и условия</0>",
-      "noTermsUrlFooter": "Ты сам отвечаешь за свои действия на {{appName}}. {{appName}} снимает с себя всякую ответственность за твои активы или взаимодействие с {{providerName}}. Ты можешь ознакомиться с документами {{providerName}}<0>здесь</0>, а с нашими Условиями и Положениями <1>здесь</1>.",
+      "noTermsUrlFooter": "Вы несете ответственность за свои действия в {{appName}}. {{appName}} отказывается от ответственности за ваши активы или взаимодействия с {{providerName}}. С документами {{providerName}} можно ознакомиться <0>здесь</0>, а с нашими Положениями и условиями <1>здесь</1>.",
       "primaryCta": "Завершить",
       "secondaryCta": "Отмена",
       "yieldRate": "Доходность (прибл.)",
@@ -2670,7 +2670,7 @@
         "chooseDescription": "Любое финансовое решение — это личный выбор. Мы агрегировали определенные пулы по разным протоколам, но у каждого пула есть свои преимущества и риски. Мы постарались предоставить полезную информацию по каждому пулу, но всегда лучше провести дополнительное исследование, если имеются сомнения."
       },
       "noPoolsTitle": "Вы еще не присоединились ни к одному пулу",
-      "noPoolsDescription": "Узнай о доступных пулах, выбери тот, который соответствует твоим целям, и используй свою криптовалюту по максимуму.",
+      "noPoolsDescription": "Узнайте о доступных пулах, выберите нужный и получите максимальную отдачу от своей криптовалюты.",
       "errorTitle": "Невозможно загрузить пулы",
       "errorDescription": "Ой, при попытке загрузить информацию о пуле что-то пошло не так. Повторите попытку.",
       "errorButton": "Повторить попытку"
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 9d432b94d77..7ed9023811a 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -2505,12 +2505,12 @@
       }
     },
     "cta": {
-      "title": "Kripto paranızdan kazanın",
+      "title": "Kripto paranızdan kazanç sağlayın",
       "subtitle": "Bugün para yatırın ve getiri kazanın",
       "description": "Bir kredi havuzu sağlarken ne kadar kazanabileceğinizi görün"
     },
     "earnInfo": {
-      "title": "\nkripto paranızdan kazanın",
+      "title": "Kripto paranızdan\nkazanç sağlayın",
       "details": {
         "earn": {
           "titleGasSubsidy": "Gas Ücretleri Olmadan Kazancınızı En Üst Düzeye Çıkarın*",
@@ -2546,9 +2546,9 @@
       "description": "Bir havuza {{symbol}} ekleyerek yılda yaklaşık %{{apy}} kazanın"
     },
     "entrypoint": {
-      "title": "Kripto paranızdan kazanın",
+      "title": "Kripto paranızdan kazanç sağlayın",
       "subtitle": "Yatırın ve kazanın",
-      "description": "Bir likidite havuzu aracılığıyla borç verdiğinizde kripto varlıklarınızdan kazanın"
+      "description": "Bir likidite havuzu aracılığıyla borç vererek kripto varlıklarınızdan kazanç sağlayın"
     },
     "enterAmount": {
       "title": "Ne kadar yatırmak istersiniz?",
@@ -2608,7 +2608,7 @@
       "network": "Ağ",
       "footer": "Bir Aave havuzuna kripto yatırarak, Aave kullanımıyla ilişkili riskleri kabul etmiş olursunuz. <0>Şartlar ve Koşullar</0>",
       "footerV1_93": "Bir {{providerName}} havuzuna kripto yatırarak {{providerName}} kullanımıyla ilişkili riskleri kabul etmiş olursunuz. <0>Şartlar ve Koşullar</0>",
-      "noTermsUrlFooter": "{{appName}}adresindeki eylemlerinizden siz sorumlusunuz. {{appName}} , varlıklarınız veya {{providerName}}ile etkileşimleriniz için tüm sorumluluğu reddeder. {{providerName}}'un belgelerini <0>buradan</0> ve Hüküm ve Koşullarımızı <1>buradan</1> inceleyebilirsiniz.",
+      "noTermsUrlFooter": "{{appName}} uygulamasındaki eylemlerinizden siz sorumlusunuz. {{appName}}, varlıklarınız veya {{providerName}} ile etkileşimlerinizden doğabilecek tüm sorumluluğu reddeder. {{providerName}} sağlayıcısına ait belgeleri <0>buradan</0> ve Hüküm ve Koşullarımızı ise <1>buradan</1> inceleyebilirsiniz.",
       "primaryCta": "Tamamlandı",
       "secondaryCta": "İptal",
       "yieldRate": "Verim Oranı (tahmini)",
@@ -2666,7 +2666,7 @@
         "chooseDescription": "Her türlü finansal karar kişisel bir seçimdir. Farklı protokollerdeki bazı havuzları bir araya getirdik, ancak her havuzun avantajları ve riskleri vardır. Her havuza ilişkin bazı yararlı bilgiler sağlamak için elimizden geleni yapıyoruz ancak emin değilseniz ek araştırma yapmak her zaman en iyisidir."
       },
       "noPoolsTitle": "Henüz hiçbir havuza katılmadınız",
-      "noPoolsDescription": "Mevcut havuzları keşfedin, hedeflerinize uygun olanı seçin ve kripto paranızdan en iyi şekilde yararlanın.",
+      "noPoolsDescription": "Mevcut havuzları keşfedin, hedeflerinize uygun bir havuz seçin ve kripto paralarınızdan en iyi şekilde yararlanın.",
       "errorTitle": "Havuzlar yüklenemiyor.",
       "errorDescription": "Hay aksi, havuz bilgileri yüklenirken bir şeyler ters gitti. Lütfen tekrar deneyin.",
       "errorButton": "Tekrar deneyin"
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index e6338442cb7..afb5975b0c4 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -2514,7 +2514,7 @@
       "description": "Дізнайтеся, скільки можна заробити на послугах пулу з надавання позики"
     },
     "earnInfo": {
-      "title": "Заробляйте на своїй криптовалюті\n",
+      "title": "Заробляйте на своїй\nкриптовалюті",
       "details": {
         "earn": {
           "titleGasSubsidy": "Максимізувати заробітки без комісій на газ*",
@@ -2552,7 +2552,7 @@
     "entrypoint": {
       "title": "Заробляйте на своїй криптовалюті",
       "subtitle": "Внесіть кошти та отримуйте прибуток",
-      "description": "Заробляйте на своїх криптоактивах, кредитуючи через пул ліквідності"
+      "description": "Заробляйте на своїх криптоактивах, надаючи позики через пул ліквідності"
     },
     "enterAmount": {
       "title": "Яку суму ви бажаєте внести?",
@@ -2612,7 +2612,7 @@
       "network": "Мережа",
       "footer": "Коли ви вносите крипту в пул Aave, то приймаєте ризики, пов’язані з використанням Aave. <0>Умови надання послуг</0>",
       "footerV1_93": "Вносячи криптовалюту в пул {{providerName}}, ви приймаєте ризики, пов’язані з використанням {{providerName}}. <0>Правила та Умови</0>",
-      "noTermsUrlFooter": "Ви несете відповідальність за свої дії на сайті {{appName}}. {{appName}} відмовляється від будь-якої відповідальності за ваші активи або взаємодію з {{providerName}}. Ви можете переглянути документи {{providerName}}<0>тут</0> і наші Умови та положення <1>тут</1>.",
+      "noTermsUrlFooter": "Ви несете відповідальність за свої дії в {{appName}}. {{appName}} знімає із себе відповідальність за ваші активи або взаємодію з {{providerName}}. Ви можете ознайомитися з документами {{providerName}} <0>тут</0> і переглянути наші Правила та Умови <1>тут</1>.",
       "primaryCta": "Завершити",
       "secondaryCta": "Скасувати",
       "yieldRate": "Орієнтовна ставка прибутковості",
@@ -2670,7 +2670,7 @@
         "chooseDescription": "Будь-яке фінансове рішення — це особистий вибір. Ми об’єднали деякі пули з різних протоколів, але кожен пул має свої переваги та ризики. Ми робимо все можливе, щоб надати корисну інформацію для кожного пулу, але завжди краще провести додаткове дослідження, якщо у вас є сумніви."
       },
       "noPoolsTitle": "Ви ще не приєдналися до жодного пулу",
-      "noPoolsDescription": "Відкрийте для себе доступні пули, виберіть той, який відповідає вашим цілям, і отримуйте максимальну вигоду від своєї криптовалюти.",
+      "noPoolsDescription": "Ознайомтеся з доступними пулами та оберіть пул, який відповідає вашим цілям для ефективного використання своєї криптовалюти.",
       "errorTitle": "Не вдалося завантажити пули",
       "errorDescription": "На жаль, під час спроби завантажити інформацію про пул сталася помилка. Будь ласка, спробуйте ще раз.",
       "errorButton": "Спробувати ще раз"
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 7ac9f48839c..0dfc5dce3b2 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -2546,7 +2546,7 @@
     "entrypoint": {
       "title": "让您的加密货币增值",
       "subtitle": "存入并赚取收益",
-      "description": "通过流动性池出借加密资产，赚取收益"
+      "description": "通过流动性池出借加密货币资产，赚取收益"
     },
     "enterAmount": {
       "title": "您想存入多少钱？",
@@ -2606,7 +2606,7 @@
       "network": "网络",
       "footer": "向 Aave 池存入加密货币，即表示您接受与使用 Aave 相关的风险。<0>条款和条件</0>",
       "footerV1_93": "向 {{providerName}} 池存入加密货币，即表示您接受使用 {{providerName}} 的相关风险。<0>条款和条件</0>",
-      "noTermsUrlFooter": "您要对自己在 {{appName}}上的行为负责。 {{appName}} 不对您的资产或与 {{providerName}}的互动承担任何责任。您可以<0>在此处</0>查看 {{providerName}}的文件，<1>在此处</1>查看我们的条款和条件。",
+      "noTermsUrlFooter": "您要对自己在 {{appName}} 上的行为负责。{{appName}} 不对您的资产或与 {{providerName}} 的互动承担任何责任。您可以在<0>此处</0>查看 {{providerName}} 的文件，在<1>此处</1>查看我们的条款和条件。",
       "primaryCta": "完成",
       "secondaryCta": "取消",
       "yieldRate": "收益率（估计值）",
@@ -2664,7 +2664,7 @@
         "chooseDescription": "任何财务决定都是个人选择。我们汇总了一些不同协议中的资金池，但每个资金池都有好处和风险。我们会尽力提供关于每个资金池的有用信息，如果不确定，最好还是多做一些研究。"
       },
       "noPoolsTitle": "您还没有加入任何池",
-      "noPoolsDescription": "发现可用的资金池，选择一个符合您目标的资金池，充分利用您的加密货币。",
+      "noPoolsDescription": "探索可用的池，选择一个符合您目标的池，充分利用您的加密货币。",
       "errorTitle": "无法加载资金池",
       "errorDescription": "哎呀，在加载资金池信息时出了点问题。请重试。",
       "errorButton": "再试一次"
diff --git a/package.json b/package.json
index dad85ae1f1b..f2c2c715f7e 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@badrap/result": "~0.2.13",
     "@coinbase/cbpay-js": "^2.2.1",
     "@crowdin/ota-client": "^0.7.0",
-    "@fiatconnect/fiatconnect-sdk": "^0.5.58",
+    "@fiatconnect/fiatconnect-sdk": "^0.5.59",
     "@fiatconnect/fiatconnect-types": "^13.3.8",
     "@gorhom/bottom-sheet": "^4.6.4",
     "@json-rpc-tools/utils": "^1.7.6",
diff --git a/scripts/update_root_state_schema.sh b/scripts/update_root_state_schema.sh
index 0a229ec6a44..b72a686d313 100755
--- a/scripts/update_root_state_schema.sh
+++ b/scripts/update_root_state_schema.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 
 root_state_schema="test/RootStateSchema.json"
 
-typescript-json-schema ./tsconfig.json RootState --include src/redux/reducers.ts --ignoreErrors --required --noExtraProps > "$root_state_schema"
+typescript-json-schema ./tsconfig.json RootStateForSchemaGeneration --include src/redux/reducersForSchemaGeneration.ts --ignoreErrors --required --noExtraProps > "$root_state_schema"
 
 if git diff --exit-code "$root_state_schema"; then
   echo "$root_state_schema is up to date"
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index fb3b330e5f7..a025cf0a73d 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -112,6 +112,9 @@ function EarnEnterAmount({ route }: Props) {
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableFromTokens[0])
   const [withdrawToken, _setWithdrawToken] = useState<TokenBalance>(() => withdrawTokens[0])
+  const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
+    isWithdrawal ? withdrawToken : inputToken
+  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -197,14 +200,8 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(
-    parsedTokenAmount,
-    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
-  )
-  const localToToken = useLocalToTokenAmount(
-    parsedLocalAmount,
-    isWithdrawal ? inputToken.tokenId : withdrawToken.tokenId
-  )
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, transactionToken.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, transactionToken.tokenId)
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
@@ -231,13 +228,18 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode, withdrawToken])
+  }, [
+    tokenAmountInput,
+    localAmountInput,
+    enteredIn,
+    inputToken,
+    mode,
+    withdrawToken,
+    transactionToken,
+  ])
 
   const feeCurrencies = useSelector((state) =>
-    feeCurrenciesSelector(
-      state,
-      mode === 'withdraw' ? withdrawToken.networkId : inputToken.networkId
-    )
+    feeCurrenciesSelector(state, transactionToken.networkId)
   )
 
   useEffect(() => {
@@ -246,27 +248,22 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(isWithdrawal ? withdrawToken.balance : inputToken.balance)
+      tokenAmount.isGreaterThan(transactionToken.balance)
     ) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(
-        tokenAmount,
-        isWithdrawal ? withdrawToken : inputToken,
-        feeCurrencies
-      )
+      return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, inputToken, mode, withdrawToken, feeCurrencies])
+  }, [tokenAmount, inputToken, mode, withdrawToken, transactionToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
-  const isAmountLessThanBalance =
-    mode === 'withdraw'
-      ? tokenAmount && tokenAmount.lte(pool.balance)
-      : tokenAmount && tokenAmount.lte(inputToken.balance)
+  const isAmountLessThanBalance = isWithdrawal
+    ? tokenAmount && tokenAmount.lte(pool.balance)
+    : tokenAmount && tokenAmount.lte(inputToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -279,7 +276,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const disabled =
     // Should disable if the user enters 0, has enough balance but the transaction is not possible, or does not have enough balance
-    !!tokenAmount?.isZero() || (!isWithdrawal && !transactionIsPossible)
+    !!tokenAmount?.isZero() || !transactionIsPossible
 
   const onTokenAmountInputChange = (value: string) => {
     setMaxPressed(false)
@@ -361,7 +358,7 @@ function EarnEnterAmount({ route }: Props) {
         : tokenAmount.toString(),
     })
 
-    if (mode === 'withdraw') {
+    if (isWithdrawal) {
       navigate(Screens.EarnConfirmationScreen, {
         pool,
         mode,
@@ -428,7 +425,7 @@ function EarnEnterAmount({ route }: Props) {
                 testID="EarnEnterAmount/LocalAmountInput"
                 editable={!!inputToken.priceUsd}
               />
-              {(isWithdrawal ? !withdrawToken.balance.isZero() : !inputToken.balance.isZero()) && (
+              {!transactionToken.balance.isZero() && (
                 <Touchable
                   borderRadius={MAX_BORDER_RADIUS}
                   onPress={onMaxAmountPress}
diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
index 9db581074e3..80daa9bc9bb 100644
--- a/src/earn/EarnPoolInfoScreen.tsx
+++ b/src/earn/EarnPoolInfoScreen.tsx
@@ -300,14 +300,16 @@ function YieldCard({
           return (
             <View style={styles.cardLineContainer} key={index}>
               <View style={styles.cardLineLabel}>
-                <Text numberOfLines={1} style={styles.cardLabelText}>
-                  {rate.label}
-                </Text>
-                <TokenIcons
-                  tokensInfo={tokenInfo}
-                  size={IconSize.XXSMALL}
-                  showNetworkIcon={false}
-                />
+                <View style={styles.yieldRateLabelContainer}>
+                  <Text numberOfLines={1} style={styles.cardLabelText}>
+                    {rate.label}
+                  </Text>
+                  <TokenIcons
+                    tokensInfo={tokenInfo}
+                    size={IconSize.XXSMALL}
+                    showNetworkIcon={false}
+                  />
+                </View>
               </View>
               <Text style={styles.cardLabelText}>
                 {t('earnFlow.poolInfoScreen.ratePercent', { rate: rate.percentage.toFixed(2) })}
@@ -775,6 +777,7 @@ const styles = StyleSheet.create({
   tokenIconsContainer: {
     flex: 1,
     flexDirection: 'row',
+    alignItems: 'center',
   },
   contentContainer: {
     gap: Spacing.Regular16,
@@ -790,15 +793,13 @@ const styles = StyleSheet.create({
     flex: 1,
     flexDirection: 'row',
     justifyContent: 'space-between',
-    alignItems: 'center',
   },
   cardLineLabel: {
-    flex: 1,
+    paddingRight: 20, // Prevents Icon from being cut off on long labels
+  },
+  yieldRateLabelContainer: {
     flexDirection: 'row',
     gap: Spacing.Tiny4,
-    alignItems: 'center',
-    paddingRight: 20, // Prevents Icon from being cut off on long labels
-    minWidth: '35%',
   },
   cardTitleText: {
     ...typeScale.labelSemiBoldMedium,
diff --git a/src/redux/api.ts b/src/redux/api.ts
new file mode 100644
index 00000000000..d1e185ebe44
--- /dev/null
+++ b/src/redux/api.ts
@@ -0,0 +1,9 @@
+import { fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import networkConfig from 'src/web3/networkConfig'
+
+export const baseQuery = fetchBaseQuery({
+  baseUrl: networkConfig.blockchainApiUrl,
+  headers: {
+    Accept: 'application/json',
+  },
+})
diff --git a/src/redux/apiReducersList.ts b/src/redux/apiReducersList.ts
new file mode 100644
index 00000000000..8c5126c9be0
--- /dev/null
+++ b/src/redux/apiReducersList.ts
@@ -0,0 +1,9 @@
+import { transactionFeedV2Api } from 'src/transactions/api'
+
+export type ApiReducersKeys = keyof typeof apiReducersList
+
+export const apiReducersList = {
+  [transactionFeedV2Api.reducerPath]: transactionFeedV2Api.reducer,
+} as const
+
+export const apiMiddlewares = [transactionFeedV2Api.middleware]
diff --git a/src/redux/migrations.ts b/src/redux/migrations.ts
index 6b910d8f7eb..163f3e5441c 100644
--- a/src/redux/migrations.ts
+++ b/src/redux/migrations.ts
@@ -1916,4 +1916,5 @@ export const migrations = {
     ...state,
     app: _.omit(state.app, 'numberVerified'),
   }),
+  233: (state: any) => state,
 }
diff --git a/src/redux/reducers.ts b/src/redux/reducers.ts
index f9520956ed8..0b7cb6ec9cd 100644
--- a/src/redux/reducers.ts
+++ b/src/redux/reducers.ts
@@ -1,61 +1,11 @@
-import { Action, combineReducers } from '@reduxjs/toolkit'
-import { PersistState } from 'redux-persist'
-import { Actions, ClearStoredAccountAction } from 'src/account/actions'
-import { reducer as account } from 'src/account/reducer'
-import { reducer as alert } from 'src/alert/reducer'
-import { appReducer as app } from 'src/app/reducers'
-import dappsReducer from 'src/dapps/slice'
-import earnReducer from 'src/earn/slice'
-import { reducer as fiatExchanges } from 'src/fiatExchanges/reducer'
-import fiatConnectReducer from 'src/fiatconnect/slice'
-import { homeReducer as home } from 'src/home/reducers'
-import i18nReducer from 'src/i18n/slice'
+import { type Action, combineReducers } from '@reduxjs/toolkit'
+import { type PersistState } from 'redux-persist'
+import { Actions, type ClearStoredAccountAction } from 'src/account/actions'
 import { reducer as identity } from 'src/identity/reducer'
-import { reducer as imports } from 'src/import/reducer'
-import jumpstartReducer from 'src/jumpstart/slice'
-import keylessBackupReducer from 'src/keylessBackup/slice'
-import { reducer as localCurrency } from 'src/localCurrency/reducer'
-import { reducer as networkInfo } from 'src/networkInfo/reducer'
-import nftsReducer from 'src/nfts/slice'
-import pointsReducer from 'src/points/slice'
-import positionsReducer from 'src/positions/slice'
-import priceHistoryReducer from 'src/priceHistory/slice'
-import { recipientsReducer as recipients } from 'src/recipients/reducer'
-import { sendReducer as send } from 'src/send/reducers'
-import swapReducer from 'src/swap/slice'
-import tokenReducer from 'src/tokens/slice'
-import { reducer as transactions } from 'src/transactions/reducer'
-import { reducer as walletConnect } from 'src/walletConnect/reducer'
-import { reducer as web3 } from 'src/web3/reducer'
+import { apiReducersList } from 'src/redux/apiReducersList'
+import { reducersList } from 'src/redux/reducersList'
 
-const appReducer = combineReducers({
-  app,
-  i18n: i18nReducer,
-  networkInfo,
-  alert,
-  send,
-  home,
-  transactions,
-  web3,
-  identity,
-  account,
-  recipients,
-  localCurrency,
-  imports,
-  fiatExchanges,
-  walletConnect,
-  tokens: tokenReducer,
-  dapps: dappsReducer,
-  fiatConnect: fiatConnectReducer,
-  swap: swapReducer,
-  positions: positionsReducer,
-  keylessBackup: keylessBackupReducer,
-  nfts: nftsReducer,
-  priceHistory: priceHistoryReducer,
-  jumpstart: jumpstartReducer,
-  points: pointsReducer,
-  earn: earnReducer,
-})
+const appReducer = combineReducers({ ...reducersList, ...apiReducersList })
 
 const rootReducer = (state: RootState | undefined, action: Action): RootState => {
   if (action.type === Actions.CLEAR_STORED_ACCOUNT && state) {
diff --git a/src/redux/reducersForSchemaGeneration.ts b/src/redux/reducersForSchemaGeneration.ts
new file mode 100644
index 00000000000..86ead9a14e2
--- /dev/null
+++ b/src/redux/reducersForSchemaGeneration.ts
@@ -0,0 +1,20 @@
+import { combineReducers } from 'redux'
+import { PersistState } from 'redux-persist'
+import { reducersList } from 'src/redux/reducersList'
+
+/**
+ * All the reducers up to this point were always manually maintained/changed by us.
+ * For this purpose, we have Redux migrations which are covered with tests to ensure
+ * compatibility between different versions of Redux state. With introduction of RTK-Query
+ * we introduce library-managed api reducers, which must not be manually tweaked as library
+ * can change how it stores its structure (api reducer is the cache for API endpoint).
+ *
+ * For this purpose, it is mandatory to omit api reducers completely from the flow of
+ * typescript-json-schema generation. This file only includes existing non-api reducers
+ * necessary for schema generation. Trying to generate the schema with api reducers throws
+ * an error of unsupported type from @reduxjs/tookit/query/react.
+ */
+const reducerForSchemaGeneration = combineReducers(reducersList)
+export type RootStateForSchemaGeneration = ReturnType<typeof reducerForSchemaGeneration> & {
+  _persist: PersistState
+}
diff --git a/src/redux/reducersList.ts b/src/redux/reducersList.ts
new file mode 100644
index 00000000000..efea1b99b02
--- /dev/null
+++ b/src/redux/reducersList.ts
@@ -0,0 +1,55 @@
+import { reducer as account } from 'src/account/reducer'
+import { reducer as alert } from 'src/alert/reducer'
+import { appReducer as app } from 'src/app/reducers'
+import dappsReducer from 'src/dapps/slice'
+import earnReducer from 'src/earn/slice'
+import { reducer as fiatExchanges } from 'src/fiatExchanges/reducer'
+import fiatConnectReducer from 'src/fiatconnect/slice'
+import { homeReducer as home } from 'src/home/reducers'
+import i18nReducer from 'src/i18n/slice'
+import { reducer as identity } from 'src/identity/reducer'
+import { reducer as imports } from 'src/import/reducer'
+import jumpstartReducer from 'src/jumpstart/slice'
+import keylessBackupReducer from 'src/keylessBackup/slice'
+import { reducer as localCurrency } from 'src/localCurrency/reducer'
+import { reducer as networkInfo } from 'src/networkInfo/reducer'
+import nftsReducer from 'src/nfts/slice'
+import pointsReducer from 'src/points/slice'
+import positionsReducer from 'src/positions/slice'
+import priceHistoryReducer from 'src/priceHistory/slice'
+import { recipientsReducer as recipients } from 'src/recipients/reducer'
+import { sendReducer as send } from 'src/send/reducers'
+import swapReducer from 'src/swap/slice'
+import tokenReducer from 'src/tokens/slice'
+import { reducer as transactions } from 'src/transactions/reducer'
+import { reducer as walletConnect } from 'src/walletConnect/reducer'
+import { reducer as web3 } from 'src/web3/reducer'
+
+export const reducersList = {
+  app,
+  i18n: i18nReducer,
+  networkInfo,
+  alert,
+  send,
+  home,
+  transactions,
+  web3,
+  identity,
+  account,
+  recipients,
+  localCurrency,
+  imports,
+  fiatExchanges,
+  walletConnect,
+  tokens: tokenReducer,
+  dapps: dappsReducer,
+  fiatConnect: fiatConnectReducer,
+  swap: swapReducer,
+  positions: positionsReducer,
+  keylessBackup: keylessBackupReducer,
+  nfts: nftsReducer,
+  priceHistory: priceHistoryReducer,
+  jumpstart: jumpstartReducer,
+  points: pointsReducer,
+  earn: earnReducer,
+} as const
diff --git a/src/redux/store.test.ts b/src/redux/store.test.ts
index 04e47fc4450..716bc30634c 100644
--- a/src/redux/store.test.ts
+++ b/src/redux/store.test.ts
@@ -1,7 +1,9 @@
 import Ajv from 'ajv'
 import { spawn, takeEvery } from 'redux-saga/effects'
+import { ApiReducersKeys, apiReducersList } from 'src/redux/apiReducersList'
 import * as createMigrateModule from 'src/redux/createMigrate'
 import { migrations } from 'src/redux/migrations'
+import { RootState } from 'src/redux/reducers'
 import { rootSaga } from 'src/redux/sagas'
 import { _persistConfig, setupStore } from 'src/redux/store'
 import * as accountCheckerModule from 'src/utils/accountChecker'
@@ -25,6 +27,22 @@ const resetStateOnInvalidStoredAccount = jest.spyOn(
 
 const loggerErrorSpy = jest.spyOn(Logger, 'error')
 
+function getNonApiReducers<R = Omit<RootState, ApiReducersKeys>>(state: RootState): R {
+  const apiReducersKeys = Object.keys(apiReducersList)
+  const nonApiReducers = {} as R
+
+  for (const [key, value] of Object.entries(state)) {
+    const isApiReducer = apiReducersKeys.includes(key)
+
+    // api reducers are not persisted so skip them
+    if (isApiReducer) continue
+
+    nonApiReducers[key as keyof R] = value as unknown as any
+  }
+
+  return nonApiReducers
+}
+
 beforeEach(() => {
   jest.clearAllMocks()
   // For some reason createMigrate.mockRestore doesn't work, so instead we manually reset it to the original implementation
@@ -81,9 +99,9 @@ describe('store state', () => {
       })
     })
 
-    const data = store.getState()
+    const data = getNonApiReducers(store.getState())
 
-    const ajv = new Ajv({ allErrors: true })
+    const ajv = new Ajv({ allErrors: true, allowUnionTypes: true })
     const schema = require('test/RootStateSchema.json')
     const validate = ajv.compile(schema)
     const isValid = validate(data)
@@ -98,7 +116,7 @@ describe('store state', () => {
       {
         "_persist": {
           "rehydrated": true,
-          "version": 232,
+          "version": 233,
         },
         "account": {
           "acceptedTerms": false,
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 84d37a8c124..866dfe24534 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -1,15 +1,18 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { configureStore, Middleware } from '@reduxjs/toolkit'
+import { setupListeners } from '@reduxjs/toolkit/query'
 import { getStoredState, PersistConfig, persistReducer, persistStore } from 'redux-persist'
 import FSStorage from 'redux-persist-fs-storage'
 import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'
 import createSagaMiddleware from 'redux-saga'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { PerformanceEvents } from 'src/analytics/Events'
+import { apiMiddlewares } from 'src/redux/apiReducersList'
 import { createMigrate } from 'src/redux/createMigrate'
 import { migrations } from 'src/redux/migrations'
 import rootReducer, { RootState as ReducersRootState } from 'src/redux/reducers'
 import { rootSaga } from 'src/redux/sagas'
+import { transactionFeedV2Api } from 'src/transactions/api'
 import { resetStateOnInvalidStoredAccount } from 'src/utils/accountChecker'
 import Logger from 'src/utils/Logger'
 import { ONE_DAY_IN_MILLIS } from 'src/utils/time'
@@ -21,10 +24,17 @@ const persistConfig: PersistConfig<ReducersRootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-inc/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 232,
+  version: 233,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
-  blacklist: ['networkInfo', 'alert', 'imports', 'keylessBackup', 'jumpstart'],
+  blacklist: [
+    'networkInfo',
+    'alert',
+    'imports',
+    'keylessBackup',
+    'jumpstart',
+    transactionFeedV2Api.reducerPath,
+  ],
   stateReconciler: autoMergeLevel2,
   migrate: async (...args) => {
     const migrate = createMigrate(migrations)
@@ -103,7 +113,8 @@ export const setupStore = (initialState?: ReducersRootState, config = persistCon
       )
     },
   })
-  const middlewares: Middleware[] = [sagaMiddleware]
+
+  const middlewares: Middleware[] = [sagaMiddleware, ...apiMiddlewares]
 
   if (__DEV__ && !process.env.JEST_WORKER_ID) {
     const createDebugger = require('redux-flipper').default
@@ -172,3 +183,5 @@ export { persistor, store }
 
 export type RootState = ReturnType<typeof store.getState>
 export type AppDispatch = typeof store.dispatch
+
+setupListeners(store.dispatch)
diff --git a/src/swap/SwapScreen.test.tsx b/src/swap/SwapScreen.test.tsx
index 038fa02f8b6..31545a018f2 100644
--- a/src/swap/SwapScreen.test.tsx
+++ b/src/swap/SwapScreen.test.tsx
@@ -1328,6 +1328,9 @@ describe('SwapScreen', () => {
           status: 'started',
         },
       },
+
+      // as per test/utils.ts, line 105
+      transactionFeedV2Api: undefined,
     })
 
     update(
@@ -1373,6 +1376,9 @@ describe('SwapScreen', () => {
           status: 'error',
         },
       },
+
+      // as per test/utils.ts, line 105
+      transactionFeedV2Api: undefined,
     })
 
     update(
diff --git a/src/transactions/NoActivity.tsx b/src/transactions/NoActivity.tsx
index 40431e5a607..02cf3e84333 100644
--- a/src/transactions/NoActivity.tsx
+++ b/src/transactions/NoActivity.tsx
@@ -1,12 +1,14 @@
+import { type SerializedError } from '@reduxjs/toolkit'
+import { type FetchBaseQueryError } from '@reduxjs/toolkit/query'
 import * as React from 'react'
-import { WithTranslation } from 'react-i18next'
+import { type WithTranslation } from 'react-i18next'
 import { ActivityIndicator, StyleSheet, Text, View } from 'react-native'
 import { withTranslation } from 'src/i18n'
 import colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 interface OwnProps {
   loading: boolean
-  error: Error | undefined
+  error: Error | FetchBaseQueryError | SerializedError | undefined
 }
 
 type Props = OwnProps & WithTranslation
diff --git a/src/transactions/api.ts b/src/transactions/api.ts
new file mode 100644
index 00000000000..2f78d2662c3
--- /dev/null
+++ b/src/transactions/api.ts
@@ -0,0 +1,29 @@
+import { createApi } from '@reduxjs/toolkit/query/react'
+import { baseQuery } from 'src/redux/api'
+import type { TokenTransaction } from 'src/transactions/types'
+
+export type TransactionFeedV2Response = {
+  transactions: TokenTransaction[]
+  pageInfo: {
+    hasNextPage: boolean
+  }
+}
+
+export const transactionFeedV2Api = createApi({
+  reducerPath: 'transactionFeedV2Api',
+  baseQuery,
+  endpoints: (builder) => ({
+    transactionFeedV2: builder.query<
+      TransactionFeedV2Response,
+      { address: string; endCursor: number }
+    >({
+      query: ({ address, endCursor }) => {
+        const cursor = endCursor ? `?endCursor=${endCursor}` : ''
+        return `/wallet/${address}/transactions${cursor}`
+      },
+      keepUnusedDataFor: 60, // 1 min
+    }),
+  }),
+})
+
+export const { useTransactionFeedV2Query } = transactionFeedV2Api
diff --git a/src/transactions/apiTestHelpers.ts b/src/transactions/apiTestHelpers.ts
new file mode 100644
index 00000000000..73f426ed16d
--- /dev/null
+++ b/src/transactions/apiTestHelpers.ts
@@ -0,0 +1,52 @@
+import type { EnhancedStore, Middleware, Reducer, UnknownAction } from '@reduxjs/toolkit'
+import { combineReducers, configureStore } from '@reduxjs/toolkit'
+import { ApiReducersKeys } from 'src/redux/apiReducersList'
+import { RootState } from 'src/redux/reducers'
+import { getMockStoreData, RecursivePartial } from 'test/utils'
+
+/**
+ * This function is taken from the Redux team. It creates a testable store that is compatible
+ * with RTK-Query. It is slightly modified to also include the preloaded state.
+ * https://github.com/reduxjs/redux-toolkit/blob/e7540a5594b0d880037f2ff41a83a32c629d3117/packages/toolkit/src/tests/utils/helpers.tsx#L186
+ *
+ * For more info on why this is needed and how it works - here's an article that answers some of the questions:
+ * https://medium.com/@johnmcdowell0801/testing-rtk-query-with-jest-cdfa5aaf3dc1
+ */
+export function setupApiStore<
+  A extends {
+    reducer: Reducer<any, any>
+    reducerPath: string
+    middleware: Middleware
+  },
+  Preloaded extends RecursivePartial<Omit<RootState, ApiReducersKeys>>,
+  R extends Record<string, Reducer<any, any>> = Record<never, never>,
+>(api: A, preloadedState: Preloaded, extraReducers?: R) {
+  const getStore = () =>
+    configureStore({
+      preloadedState: getMockStoreData(preloadedState),
+      reducer: combineReducers({
+        [api.reducerPath]: api.reducer,
+        ...extraReducers,
+      }),
+      middleware: (getDefaultMiddleware) => {
+        return getDefaultMiddleware({
+          serializableCheck: false,
+          immutableCheck: false,
+        }).concat(api.middleware)
+      },
+    })
+
+  type Store = { api: ReturnType<A['reducer']> } & { [K in keyof R]: ReturnType<R[K]> }
+  type StoreType = EnhancedStore<
+    Store,
+    UnknownAction,
+    ReturnType<typeof getStore> extends EnhancedStore<any, any, infer M> ? M : never
+  >
+
+  const initialStore = getStore() as StoreType
+  const refObj = { api, store: initialStore }
+  const store = getStore() as StoreType
+  refObj.store = store
+
+  return refObj
+}
diff --git a/src/transactions/feed/TransactionFeedV2.test.tsx b/src/transactions/feed/TransactionFeedV2.test.tsx
new file mode 100644
index 00000000000..04e746a6558
--- /dev/null
+++ b/src/transactions/feed/TransactionFeedV2.test.tsx
@@ -0,0 +1,323 @@
+import { fireEvent, render, waitFor, within } from '@testing-library/react-native'
+import { FetchMock } from 'jest-fetch-mock/types'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { ReactTestInstance } from 'react-test-renderer'
+import { RootState } from 'src/redux/reducers'
+import { reducersList } from 'src/redux/reducersList'
+import { getDynamicConfigParams, getFeatureGate, getMultichainFeatures } from 'src/statsig'
+import TransactionFeedV2 from 'src/transactions/feed/TransactionFeedV2'
+import {
+  NetworkId,
+  TokenTransaction,
+  TokenTransactionTypeV2,
+  TransactionStatus,
+} from 'src/transactions/types'
+import { mockCusdAddress, mockCusdTokenId } from 'test/values'
+
+import { ApiReducersKeys } from 'src/redux/apiReducersList'
+import { transactionFeedV2Api, type TransactionFeedV2Response } from 'src/transactions/api'
+import { setupApiStore } from 'src/transactions/apiTestHelpers'
+import { RecursivePartial } from 'test/utils'
+
+jest.mock('src/statsig')
+
+const STAND_BY_TRANSACTION_SUBTITLE_KEY = 'confirmingTransaction'
+const mockFetch = fetch as FetchMock
+
+function mockTransaction(data?: Partial<TokenTransaction>): TokenTransaction {
+  return {
+    __typename: 'TokenTransferV3',
+    networkId: NetworkId['celo-alfajores'],
+    address: '0xd68360cce1f1ff696d898f58f03e0f1252f2ea33',
+    amount: {
+      tokenId: mockCusdTokenId,
+      tokenAddress: mockCusdAddress,
+      value: '0.1',
+    },
+    block: '8648978',
+    fees: [],
+    metadata: {},
+    timestamp: 1542306118,
+    transactionHash: '0x544367eaf2b01622dd1c7b75a6b19bf278d72127aecfb2e5106424c40c268e8b2',
+    type: TokenTransactionTypeV2.Received,
+    status: TransactionStatus.Complete,
+    ...(data as any),
+  }
+}
+
+function getNumTransactionItems(sectionList: ReactTestInstance) {
+  // data[0] is the first section in the section list - all mock transactions
+  // are for the same section / date
+  return sectionList.props.data[0].data.length
+}
+
+const typedResponse = (response: Partial<TransactionFeedV2Response>) => JSON.stringify(response)
+
+function renderScreen(storeOverrides: RecursivePartial<Omit<RootState, ApiReducersKeys>> = {}) {
+  const state: typeof storeOverrides = {
+    web3: { account: '0x00' },
+    ...storeOverrides,
+  }
+  const storeRef = setupApiStore(transactionFeedV2Api, state, reducersList)
+
+  const tree = render(
+    <Provider store={storeRef.store}>
+      <TransactionFeedV2 />
+    </Provider>
+  )
+
+  return {
+    ...tree,
+    store: storeRef.store,
+  }
+}
+
+beforeEach(() => {
+  mockFetch.resetMocks()
+  jest.clearAllMocks()
+  jest.mocked(getMultichainFeatures).mockReturnValue({
+    showCico: [NetworkId['celo-alfajores']],
+    showBalances: [NetworkId['celo-alfajores']],
+    showTransfers: [NetworkId['celo-alfajores']],
+    showApprovalTxsInHomefeed: [NetworkId['celo-alfajores']],
+  })
+  jest.mocked(getDynamicConfigParams).mockReturnValue({
+    jumpstartContracts: {
+      ['celo-alfajores']: { contractAddress: '0x7bf3fefe9881127553d23a8cd225a2c2442c438c' },
+    },
+  })
+})
+
+describe('TransactionFeedV2', () => {
+  it('renders correctly when there is a response', async () => {
+    mockFetch.mockResponse(typedResponse({ transactions: [mockTransaction()] }))
+    const { store, ...tree } = renderScreen()
+
+    await waitFor(() => expect(tree.getByTestId('TransactionList').props.data.length).toBe(1))
+    expect(tree.queryByTestId('NoActivity/loading')).toBeNull()
+    expect(tree.queryByTestId('NoActivity/error')).toBeNull()
+    expect(mockFetch).toHaveBeenCalledTimes(1)
+    expect(tree.getAllByTestId('TransferFeedItem').length).toBe(1)
+    expect(
+      within(tree.getByTestId('TransferFeedItem')).getByTestId('TransferFeedItem/title')
+    ).toHaveTextContent(
+      'feedItemReceivedTitle, {"displayName":"feedItemAddress, {\\"address\\":\\"0xd683...ea33\\"}"}'
+    )
+  })
+
+  it('renders correctly with completed standby transactions', async () => {
+    mockFetch.mockResponse(typedResponse({ transactions: [mockTransaction()] }))
+
+    const tree = renderScreen({
+      transactions: {
+        standbyTransactions: [mockTransaction({ transactionHash: '0x10' })],
+      },
+    })
+
+    await waitFor(() => expect(tree.getAllByTestId('TransferFeedItem').length).toBe(2))
+  })
+
+  it("doesn't render transfers for tokens that we don't know about", async () => {
+    mockFetch.mockResponse(typedResponse({ transactions: [mockTransaction()] }))
+    const { store, ...tree } = renderScreen()
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+    const items = tree.getAllByTestId('TransferFeedItem/title')
+    expect(items.length).toBe(1)
+  })
+
+  it('renders the loading indicator while it loads', async () => {
+    const tree = renderScreen()
+    expect(tree.getByTestId('NoActivity/loading')).toBeDefined()
+    expect(tree.queryByTestId('NoActivity/error')).toBeNull()
+    expect(tree.queryByTestId('TransactionList')).toBeNull()
+  })
+
+  it("renders an error screen if there's no cache and the query fails", async () => {
+    mockFetch.mockReject(new Error('Test error'))
+    const tree = renderScreen()
+
+    await waitFor(() => tree.getByTestId('NoActivity/error'))
+    expect(tree.queryByTestId('NoActivity/loading')).toBeNull()
+    expect(tree.queryByTestId('TransactionList')).toBeNull()
+  })
+
+  it('renders correctly when there are confirmed transactions and stand by transactions', async () => {
+    mockFetch.mockResponse(typedResponse({ transactions: [mockTransaction()] }))
+
+    const tree = renderScreen({
+      transactions: {
+        standbyTransactions: [
+          mockTransaction({ transactionHash: '0x10', status: TransactionStatus.Pending }),
+        ],
+      },
+    })
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+
+    expect(tree.queryByTestId('NoActivity/loading')).toBeNull()
+    expect(tree.queryByTestId('NoActivity/error')).toBeNull()
+
+    const subtitles = tree.queryAllByTestId('TransferFeedItem/subtitle')
+
+    const pendingSubtitles = subtitles.filter((node) =>
+      node.children.some((ch) => ch === STAND_BY_TRANSACTION_SUBTITLE_KEY)
+    )
+    expect(pendingSubtitles.length).toBe(1)
+  })
+
+  it('renders correct status for a complete transaction', async () => {
+    mockFetch.mockResponse(typedResponse({ transactions: [mockTransaction()] }))
+    const tree = renderScreen()
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+    expect(tree.getByText('feedItemReceivedInfo, {"context":"noComment"}')).toBeTruthy()
+  })
+
+  it('renders correct status for a failed transaction', async () => {
+    mockFetch.mockResponse(
+      typedResponse({ transactions: [mockTransaction({ status: TransactionStatus.Failed })] })
+    )
+
+    const tree = renderScreen()
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+    expect(tree.getByText('feedItemFailedTransaction')).toBeTruthy()
+  })
+
+  it('tries to fetch pages until the end is reached', async () => {
+    mockFetch
+      .mockResponseOnce(
+        typedResponse({
+          transactions: [mockTransaction({ transactionHash: '0x01', timestamp: 10 })],
+        })
+      )
+      .mockResponseOnce(
+        typedResponse({
+          transactions: [mockTransaction({ transactionHash: '0x02', timestamp: 20 })],
+        })
+      )
+      .mockResponseOnce(typedResponse({ transactions: [] }))
+
+    const { store, ...tree } = renderScreen()
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+
+    fireEvent(tree.getByTestId('TransactionList'), 'onEndReached')
+    await waitFor(() => expect(mockFetch).toBeCalled())
+    await waitFor(() => expect(tree.getByTestId('TransactionList/loading')).toBeVisible())
+    await waitFor(() => expect(tree.queryByTestId('TransactionList/loading')).toBeFalsy())
+
+    fireEvent(tree.getByTestId('TransactionList'), 'onEndReached')
+    await waitFor(() => expect(mockFetch).toBeCalled())
+    await waitFor(() => expect(tree.getByTestId('TransactionList/loading')).toBeVisible())
+    await waitFor(() => expect(tree.queryByTestId('TransactionList/loading')).toBeFalsy())
+
+    expect(mockFetch).toHaveBeenCalledTimes(3)
+    expect(getNumTransactionItems(tree.getByTestId('TransactionList'))).toBe(2)
+  })
+
+  it('tries to fetch a page of transactions, and stores empty pages', async () => {
+    mockFetch
+      .mockResponseOnce(typedResponse({ transactions: [mockTransaction()] }))
+      .mockResponseOnce(typedResponse({ transactions: [] }))
+
+    const { store, ...tree } = renderScreen()
+
+    await store.dispatch(
+      transactionFeedV2Api.endpoints.transactionFeedV2.initiate({ address: '0x00', endCursor: 0 })
+    )
+    await store.dispatch(
+      transactionFeedV2Api.endpoints.transactionFeedV2.initiate({ address: '0x00', endCursor: 123 })
+    )
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+
+    await waitFor(() => expect(mockFetch).toHaveBeenCalledTimes(2))
+    expect(getNumTransactionItems(tree.getByTestId('TransactionList'))).toBe(1)
+  })
+
+  it('renders GetStarted if SHOW_GET_STARTED is enabled and transaction feed is empty', async () => {
+    jest.mocked(getFeatureGate).mockReturnValue(true)
+    const tree = renderScreen()
+    expect(tree.getByTestId('GetStarted')).toBeDefined()
+  })
+
+  it('renders NoActivity by default if transaction feed is empty', async () => {
+    jest.mocked(getFeatureGate).mockReturnValue(false)
+    const tree = renderScreen()
+    expect(tree.getByTestId('NoActivity/loading')).toBeDefined()
+    expect(tree.getByText('noTransactionActivity')).toBeTruthy()
+  })
+
+  it('useStandByTransactions properly splits pending/confirmed transactions', async () => {
+    mockFetch.mockResponse(
+      typedResponse({
+        transactions: [
+          mockTransaction({ transactionHash: '0x4000000' }), // confirmed
+          mockTransaction({ transactionHash: '0x3000000' }), // confirmed
+          mockTransaction({ transactionHash: '0x2000000' }), // confirmed
+          mockTransaction({ transactionHash: '0x1000000' }), // confirmed
+        ],
+      })
+    )
+
+    const { store, ...tree } = renderScreen({
+      transactions: {
+        standbyTransactions: [
+          mockTransaction({ transactionHash: '0x10', status: TransactionStatus.Complete }), // confirmed
+          mockTransaction({ transactionHash: '0x20', status: TransactionStatus.Complete }), // confirmed
+          mockTransaction({ transactionHash: '0x30', status: TransactionStatus.Pending }), // pending
+          mockTransaction({ transactionHash: '0x40', status: TransactionStatus.Pending }), // pending
+          mockTransaction({ transactionHash: '0x50', status: TransactionStatus.Failed }), // confirmed
+        ],
+      },
+    })
+
+    await store.dispatch(
+      transactionFeedV2Api.endpoints.transactionFeedV2.initiate({ address: '0x00', endCursor: 0 })
+    )
+
+    await waitFor(() => {
+      expect(tree.getByTestId('TransactionList').props.data.length).toBe(2)
+    })
+
+    // from total of 9 transactions there should be 2 pending in a "recent" section
+    expect(tree.getByTestId('TransactionList').props.data[0].data.length).toBe(2)
+    // from total of 9 transactions there should be 7 confirmed in a "general" section
+    expect(tree.getByTestId('TransactionList').props.data[1].data.length).toBe(7)
+  })
+
+  it('merges only those stand by transactions that fit the timeline between min/max timestamps of the page', async () => {
+    mockFetch.mockResponse(
+      typedResponse({
+        transactions: [
+          mockTransaction({ transactionHash: '0x4000000', timestamp: 49 }), // max
+          mockTransaction({ transactionHash: '0x3000000', timestamp: 47 }),
+          mockTransaction({ transactionHash: '0x2000000', timestamp: 25 }),
+          mockTransaction({ transactionHash: '0x1000000', timestamp: 21 }), // min
+        ],
+      })
+    )
+
+    const { store, ...tree } = renderScreen({
+      transactions: {
+        standbyTransactions: [
+          mockTransaction({ transactionHash: '0x10', timestamp: 10 }), // not in scope
+          mockTransaction({ transactionHash: '0x20', timestamp: 20 }), // not in scope
+          mockTransaction({ transactionHash: '0x30', timestamp: 30 }), // in scope
+          mockTransaction({ transactionHash: '0x40', timestamp: 40 }), // in scope
+          mockTransaction({ transactionHash: '0x50', timestamp: 50 }), // not in scope
+        ],
+      },
+    })
+
+    await store.dispatch(
+      transactionFeedV2Api.endpoints.transactionFeedV2.initiate({ address: '0x00', endCursor: 0 })
+    )
+
+    await waitFor(() => tree.getByTestId('TransactionList'))
+    expect(getNumTransactionItems(tree.getByTestId('TransactionList'))).toBe(6)
+  })
+})
diff --git a/src/transactions/feed/TransactionFeedV2.tsx b/src/transactions/feed/TransactionFeedV2.tsx
new file mode 100644
index 00000000000..23f536be1dd
--- /dev/null
+++ b/src/transactions/feed/TransactionFeedV2.tsx
@@ -0,0 +1,325 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import { ActivityIndicator, SectionList, StyleSheet, View } from 'react-native'
+import SectionHead from 'src/components/SectionHead'
+import GetStarted from 'src/home/GetStarted'
+import { useSelector } from 'src/redux/hooks'
+import { getFeatureGate, getMultichainFeatures } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
+import colors from 'src/styles/colors'
+import { Spacing } from 'src/styles/styles'
+import NoActivity from 'src/transactions/NoActivity'
+import { useTransactionFeedV2Query } from 'src/transactions/api'
+import EarnFeedItem from 'src/transactions/feed/EarnFeedItem'
+import NftFeedItem from 'src/transactions/feed/NftFeedItem'
+import SwapFeedItem from 'src/transactions/feed/SwapFeedItem'
+import TokenApprovalFeedItem from 'src/transactions/feed/TokenApprovalFeedItem'
+import TransferFeedItem from 'src/transactions/feed/TransferFeedItem'
+import { allStandbyTransactionsSelector } from 'src/transactions/reducer'
+import {
+  TokenTransactionTypeV2,
+  TransactionStatus,
+  type NetworkId,
+  type NftTransfer,
+  type TokenApproval,
+  type TokenEarn,
+  type TokenExchange,
+  type TokenTransaction,
+  type TokenTransfer,
+} from 'src/transactions/types'
+import {
+  groupFeedItemsInSections,
+  standByTransactionToTokenTransaction,
+} from 'src/transactions/utils'
+import { walletAddressSelector } from 'src/web3/selectors'
+
+type PaginatedData = {
+  [timestamp: number]: TokenTransaction[]
+}
+
+// Query poll interval
+const POLL_INTERVAL_MS = 10000 // 10 sec
+const FIRST_PAGE_TIMESTAMP = 0
+
+function getAllowedNetworksForTransfers() {
+  return getMultichainFeatures().showTransfers
+}
+
+/**
+ * Join allowed networks into a string to help react memoization.
+ * N.B: This fetch-time filtering does not suffice to prevent non-Celo TXs from appearing
+ * on the home feed, since they get cached in Redux -- this is just a network optimization.
+ */
+function useAllowedNetworksForTransfers() {
+  const allowedNetworks = getAllowedNetworksForTransfers().join(',')
+  return useMemo(() => allowedNetworks.split(',') as NetworkId[], [allowedNetworks])
+}
+
+/**
+ * This function uses the same deduplication approach as "deduplicateTransactions" function from
+ * queryHelper but only for a single flattened array instead of two.
+ * Also, the queryHelper is going to be removed once we fully migrate to TransactionFeedV2,
+ * so this function would have needed to be moved from queryHelper anyway.
+ */
+function deduplicateTransactions(transactions: TokenTransaction[]): TokenTransaction[] {
+  const transactionMap: { [txHash: string]: TokenTransaction } = {}
+
+  for (const tx of transactions) {
+    transactionMap[tx.transactionHash] = tx
+  }
+
+  return Object.values(transactionMap)
+}
+
+/**
+ * If the timestamps are the same, most likely one of the transactions is an approval.
+ * On the feed we want to show the approval first.
+ */
+function sortTransactions(transactions: TokenTransaction[]): TokenTransaction[] {
+  return transactions.sort((a, b) => {
+    const diff = b.timestamp - a.timestamp
+
+    if (diff === 0) {
+      if (a.type === TokenTransactionTypeV2.Approval) return 1
+      if (b.type === TokenTransactionTypeV2.Approval) return -1
+      return 0
+    }
+
+    return diff
+  })
+}
+
+/**
+ * Every page of paginated data includes a limited amount of transactions within a certain period.
+ * In standByTransactions we might have transactions from months ago. Whenever we load a new page
+ * we only want to add those stand by transactions that are within the time period of the new page.
+ * Otherwise, if we merge all the stand by transactins into the page it will cause more late transactions
+ * that were already merged to be removed from the top of the list and move them to the bottom.
+ * This will cause the screen to "shift", which we're trying to avoid.
+ */
+function mergeStandByTransactionsInRange(
+  transactions: TokenTransaction[],
+  standBy: TokenTransaction[]
+): TokenTransaction[] {
+  if (transactions.length === 0) return []
+
+  const allowedNetworks = getAllowedNetworksForTransfers()
+  const max = transactions[0].timestamp
+  const min = transactions.at(-1)!.timestamp
+
+  const standByInRange = standBy.filter((tx) => tx.timestamp >= min && tx.timestamp <= max)
+  const deduplicatedTransactions = deduplicateTransactions([...transactions, ...standByInRange])
+  const transactionsFromAllowedNetworks = deduplicatedTransactions.filter((tx) =>
+    allowedNetworks.includes(tx.networkId)
+  )
+
+  return transactionsFromAllowedNetworks
+}
+
+/**
+ * Current implementation of allStandbyTransactionsSelector contains function
+ * getSupportedNetworkIdsForApprovalTxsInHomefeed in its selectors list which triggers a lot of
+ * unnecessary re-renders. This can be avoided if we join it's result in a string and memoize it,
+ * similar to how it was done with useAllowedNetworkIdsForTransfers hook from queryHelpers.ts
+ *
+ * Not using existing selectors for pending/confirmed stand by transaction only cause they are
+ * dependant on the un-memoized standbyTransactionsSelector selector which will break the new
+ * pagination flow.
+ *
+ * Implementation of pending is identical to pendingStandbyTransactionsSelector.
+ * Implementation of confirmed is identical to confirmedStandbyTransactionsSelector.
+ */
+function useStandByTransactions() {
+  const standByTransactions = useSelector(allStandbyTransactionsSelector)
+  const allowedNetworkForTransfers = useAllowedNetworksForTransfers()
+
+  return useMemo(() => {
+    const transactionsFromAllowedNetworks = standByTransactions.filter((tx) =>
+      allowedNetworkForTransfers.includes(tx.networkId)
+    )
+
+    const pending: TokenTransaction[] = []
+    const confirmed: TokenTransaction[] = []
+
+    for (const tx of transactionsFromAllowedNetworks) {
+      if (tx.status === TransactionStatus.Pending) {
+        pending.push(standByTransactionToTokenTransaction(tx))
+      } else {
+        confirmed.push(tx)
+      }
+    }
+
+    return { pending, confirmed }
+  }, [standByTransactions, allowedNetworkForTransfers])
+}
+
+function renderItem({ item: tx }: { item: TokenTransaction }) {
+  switch (tx.type) {
+    case TokenTransactionTypeV2.Exchange:
+    case TokenTransactionTypeV2.SwapTransaction:
+    case TokenTransactionTypeV2.CrossChainSwapTransaction:
+      return <SwapFeedItem key={tx.transactionHash} transaction={tx as TokenExchange} />
+    case TokenTransactionTypeV2.Sent:
+    case TokenTransactionTypeV2.Received:
+      return <TransferFeedItem key={tx.transactionHash} transfer={tx as TokenTransfer} />
+    case TokenTransactionTypeV2.NftSent:
+    case TokenTransactionTypeV2.NftReceived:
+      return <NftFeedItem key={tx.transactionHash} transaction={tx as NftTransfer} />
+    case TokenTransactionTypeV2.Approval:
+      return <TokenApprovalFeedItem key={tx.transactionHash} transaction={tx as TokenApproval} />
+    case TokenTransactionTypeV2.EarnDeposit:
+    case TokenTransactionTypeV2.EarnSwapDeposit:
+    case TokenTransactionTypeV2.EarnWithdraw:
+    case TokenTransactionTypeV2.EarnClaimReward:
+      return <EarnFeedItem key={tx.transactionHash} transaction={tx as TokenEarn} />
+  }
+}
+
+export default function TransactionFeedV2() {
+  const address = useSelector(walletAddressSelector)
+  const standByTransactions = useStandByTransactions()
+  const [endCursor, setEndCursor] = useState(FIRST_PAGE_TIMESTAMP)
+  const [paginatedData, setPaginatedData] = useState<PaginatedData>({ [FIRST_PAGE_TIMESTAMP]: [] })
+
+  /**
+   * This hook automatically fetches the pagination data when (and only when) the endCursor changes
+   * (we can safely ignore wallet address change as it's impossible to get changed on the fly).
+   * When components mounts, it fetches data for the first page using FIRST_PAGE_TIMESTAMP for endCursor
+   * (which is ignored in the request only for the first page as it's just an endCursor placeholder).
+   * Once the data is returned – we process it with "selectFromResult" for convenience and return the
+   * data. It gets further processed within the "updatePaginatedData" useEffect.
+   *
+   * Cursor for the next page is the timestamp of the last transaction of the last fetched page.
+   * This hook doesn't refetch data for none of the pages, neither does it do any polling. It's
+   * intention is to only fetch the next page whenever endCursor changes. Polling is handled by
+   * calling the same hook below.
+   */
+  const { data, originalArgs, nextCursor, isFetching, error } = useTransactionFeedV2Query(
+    { address: address!, endCursor },
+    {
+      skip: !address,
+      refetchOnMountOrArgChange: true,
+      selectFromResult: (result) => ({
+        ...result,
+        nextCursor: result.data?.transactions.at(-1)?.timestamp,
+      }),
+    }
+  )
+
+  /**
+   * This is the same hook as above and it only triggers the fetch request. It's intention is to
+   * only poll the data for the first page of the feed, using the FIRST_PAGE_TIMESTAMP endCursor.
+   * Thanks to how RTK-Query stores the fetched data, we know that using "useTransactionFeedV2Query"
+   * with the same arguments in multiple places will always point to the same data. This means, that
+   * we can trigger fetch request here and once data arrives - the same hook above will re-run the
+   * "selectFromResult" function for FIRST_PAGE_TIMESTAMP endCursor and will trigger the data update
+   * flow for the first page.
+   */
+  useTransactionFeedV2Query(
+    { address: address!, endCursor: FIRST_PAGE_TIMESTAMP },
+    { skip: !address, pollingInterval: POLL_INTERVAL_MS }
+  )
+
+  useEffect(
+    function updatePaginatedData() {
+      if (isFetching) return
+
+      const currentCursor = originalArgs?.endCursor // timestamp from the last transaction from the previous page.
+      const transactions = data?.transactions || []
+
+      /**
+       * There are only 2 scenarios when we actually update the paginated data:
+       *
+       * 1. Always update the first page. First page will be polled every "POLL_INTERVAL"
+       *    milliseconds. Whenever new data arrives - replace the existing first page data
+       *    with the new data as it might contain some updated information about the transactions
+       *    that are already present. The first page should not contain an empty array, unless
+       *    wallet doesn't have any transactions at all.
+       *
+       * 2. Data for every page after the first page is only set once. All the pending transactions
+       *    are supposed to arrive in the first page so everything after the first page can be
+       *    considered confirmed (completed/failed). For this reason, there's no point in updating
+       *    the data as its very unlikely to update.
+       */
+      setPaginatedData((prev) => {
+        const isFirstPage = currentCursor === FIRST_PAGE_TIMESTAMP
+        const pageDataIsAbsent =
+          currentCursor !== FIRST_PAGE_TIMESTAMP && // not the first page
+          currentCursor !== undefined && // it is a page after the first
+          prev[currentCursor] === undefined // data for this page wasn't stored yet
+
+        if (isFirstPage || pageDataIsAbsent) {
+          const mergedTransactions = mergeStandByTransactionsInRange(
+            transactions,
+            standByTransactions.confirmed
+          )
+
+          return { ...prev, [currentCursor!]: mergedTransactions }
+        }
+
+        return prev
+      })
+    },
+    [isFetching, data?.transactions, originalArgs?.endCursor, standByTransactions.confirmed]
+  )
+
+  const confirmedTransactions = useMemo(() => {
+    const flattenedPages = Object.values(paginatedData).flat()
+    const deduplicatedTransactions = deduplicateTransactions(flattenedPages)
+    const sortedTransactions = sortTransactions(deduplicatedTransactions)
+    return sortedTransactions
+  }, [paginatedData])
+
+  const sections = useMemo(() => {
+    const noPendingTransactions = standByTransactions.pending.length === 0
+    const noConfirmedTransactions = confirmedTransactions.length === 0
+    if (noPendingTransactions && noConfirmedTransactions) return []
+    return groupFeedItemsInSections(standByTransactions.pending, confirmedTransactions)
+  }, [standByTransactions.pending, confirmedTransactions])
+
+  if (!sections.length) {
+    return getFeatureGate(StatsigFeatureGates.SHOW_GET_STARTED) ? (
+      <GetStarted />
+    ) : (
+      <NoActivity loading={isFetching} error={error} />
+    )
+  }
+
+  function fetchMoreTransactions() {
+    if (nextCursor) {
+      setEndCursor(nextCursor)
+    }
+  }
+
+  return (
+    <>
+      <SectionList
+        renderItem={renderItem}
+        renderSectionHeader={(item) => <SectionHead text={item.section.title} />}
+        sections={sections}
+        keyExtractor={(item) => `${item.transactionHash}-${item.timestamp.toString()}`}
+        keyboardShouldPersistTaps="always"
+        testID="TransactionList"
+        onEndReached={fetchMoreTransactions}
+        initialNumToRender={20}
+      />
+      {isFetching && (
+        <View style={styles.centerContainer} testID="TransactionList/loading">
+          <ActivityIndicator style={styles.loadingIcon} size="large" color={colors.primary} />
+        </View>
+      )}
+    </>
+  )
+}
+
+const styles = StyleSheet.create({
+  loadingIcon: {
+    marginVertical: Spacing.Thick24,
+    height: 108,
+    width: 108,
+  },
+  centerContainer: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    flex: 1,
+  },
+})
diff --git a/src/transactions/reducer.ts b/src/transactions/reducer.ts
index b12ee4f6529..d09eb81e42e 100644
--- a/src/transactions/reducer.ts
+++ b/src/transactions/reducer.ts
@@ -167,7 +167,8 @@ export const reducer = (
   }
 }
 
-const allStandbyTransactionsSelector = (state: RootState) => state.transactions.standbyTransactions
+export const allStandbyTransactionsSelector = (state: RootState) =>
+  state.transactions.standbyTransactions
 const standbyTransactionsSelector = createSelector(
   [allStandbyTransactionsSelector, getSupportedNetworkIdsForApprovalTxsInHomefeed],
   (standbyTransactions, supportedNetworkIdsForApprovalTxs) => {
diff --git a/src/transactions/types.ts b/src/transactions/types.ts
index e75ea8debb9..f25f8a58567 100644
--- a/src/transactions/types.ts
+++ b/src/transactions/types.ts
@@ -285,3 +285,5 @@ export interface TrackedTx {
   txHash: Hash | undefined
   txReceipt: TransactionReceipt | undefined
 }
+
+export type TokenEarn = EarnWithdraw | EarnDeposit | EarnClaimReward | EarnSwapDeposit
diff --git a/src/transactions/utils.ts b/src/transactions/utils.ts
index 221d2941fd1..9506759348f 100644
--- a/src/transactions/utils.ts
+++ b/src/transactions/utils.ts
@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js'
 import { PrefixedTxReceiptProperties, TxReceiptProperties } from 'src/analytics/Properties'
 import i18n from 'src/i18n'
 import { TokenBalances } from 'src/tokens/slice'
-import { NetworkId, TrackedTx } from 'src/transactions/types'
+import { NetworkId, StandbyTransaction, TokenTransaction, TrackedTx } from 'src/transactions/types'
 import { formatFeedSectionTitle, timeDeltaInDays } from 'src/utils/time'
 import {
   getEstimatedGasFee,
@@ -120,3 +120,12 @@ export function getPrefixedTxAnalyticsProperties<Prefix extends string>(
   }
   return prefixedProperties as Partial<PrefixedTxReceiptProperties<Prefix>>
 }
+
+export function standByTransactionToTokenTransaction(tx: StandbyTransaction): TokenTransaction {
+  return {
+    fees: [],
+    block: '',
+    transactionHash: '',
+    ...tx, // in case the transaction already has the above (e.g. cross chain swaps), use the real values
+  }
+}
diff --git a/test/schema.test.ts b/test/schema.test.ts
index 22fb9b1ec84..8adf067a247 100644
--- a/test/schema.test.ts
+++ b/test/schema.test.ts
@@ -9,7 +9,7 @@ describe(getLatestSchema, () => {
   it('validates against the RootState schema', async () => {
     const data = getLatestSchema()
 
-    const ajv = new Ajv({ allErrors: true })
+    const ajv = new Ajv({ allErrors: true, allowUnionTypes: true })
     const schema = require('./RootStateSchema.json')
     const validate = ajv.compile(schema)
     const isValid = validate(data)
diff --git a/test/schemas.ts b/test/schemas.ts
index 6a8c65581e6..8d5e4dbef28 100644
--- a/test/schemas.ts
+++ b/test/schemas.ts
@@ -3533,6 +3533,14 @@ export const v232Schema = {
   app: _.omit(v231Schema.app, 'numberVerified'),
 }
 
+export const v233Schema = {
+  ...v232Schema,
+  _persist: {
+    ...v232Schema._persist,
+    version: 233,
+  },
+}
+
 export function getLatestSchema(): Partial<RootState> {
-  return v232Schema as Partial<RootState>
+  return v233Schema as Partial<RootState>
 }
diff --git a/test/utils.ts b/test/utils.ts
index 2abeba1f497..a592261296b 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -101,6 +101,9 @@ export function getMockStoreData(overrides: RecursivePartial<RootState> = {}): R
     ...defaultSchema,
     ...contactMappingData,
     ...recipientData,
+
+    // ignore api reducers that are managed by RTK-Query library itself
+    transactionFeedV2Api: undefined,
   }
 
   // Apply overrides. Note: only merges one level deep
diff --git a/yarn.lock b/yarn.lock
index b2d0ab3cf87..3ee4e828e8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1598,15 +1598,15 @@
   resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe"
   integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==
 
-"@fiatconnect/fiatconnect-sdk@^0.5.58":
-  version "0.5.58"
-  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.58.tgz#50f16032e45ce7e2f30eb1fa79cd5fb4887c3e85"
-  integrity sha512-X4BfeJT1BjQkv9LMf7zyrp66wUUsA8EZUB6IRD5li2Aom082CG2FXxL6CYeudVT2HT8uGK7REfkQrz8XzYQnwA==
+"@fiatconnect/fiatconnect-sdk@^0.5.59":
+  version "0.5.59"
+  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.59.tgz#d173cfa4ba7f773d6f79383e776e44d84af199ed"
+  integrity sha512-Iti3AeIZfzi4vwWtlOgYeE7KjK1FrqU7X3mQgS2cLAb0KtSU35D+bjH1KkAePACEvBGlWHp9aF89Fth5hEXDAw==
   dependencies:
     "@badrap/result" "^0.2.13"
     "@fiatconnect/fiatconnect-types" "^13.3.8"
     cross-fetch "^4.0.0"
-    ethers "^6.13.2"
+    ethers "^6.13.3"
     fetch-cookie "^3.0.1"
     siwe "^2.3.2"
     tough-cookie "^5.0.0"
@@ -7654,10 +7654,10 @@ ethers@^5.7.2:
     "@ethersproject/web" "5.7.1"
     "@ethersproject/wordlists" "5.7.0"
 
-ethers@^6.13.2:
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.2.tgz#4b67d4b49e69b59893931a032560999e5e4419fe"
-  integrity sha512-9VkriTTed+/27BGuY1s0hf441kqwHJ1wtN2edksEtiRvXx+soxRX3iSXTfFqq2+YwrOqbDoTHjIhQnjJRlzKmg==
+ethers@^6.13.3:
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.3.tgz#b87afdadb91cc8df5f56b9c59c96e5b206f4a600"
+  integrity sha512-/DzbZOLVtoO4fKvvQwpEucHAQgIwBGWuRvBdwE/lMXgXvvHHTSkn7XqAQ2b+gjJzZDJjWA9OD05bVceVOsBHbg==
   dependencies:
     "@adraffy/ens-normalize" "1.10.1"
     "@noble/curves" "1.2.0"

From ebe3a2af75e5b91d01584941ef94646f9e98fba6 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 14:22:41 -0700
Subject: [PATCH 019/118] chore: PR feedback

---
 src/components/TokenDisplay.tsx |  7 ++++++-
 src/earn/EarnEnterAmount.tsx    | 20 ++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/components/TokenDisplay.tsx b/src/components/TokenDisplay.tsx
index af73654482f..7e7c8f69369 100644
--- a/src/components/TokenDisplay.tsx
+++ b/src/components/TokenDisplay.tsx
@@ -31,6 +31,7 @@ export function formatValueToDisplay(value: BigNumber) {
 interface Props {
   amount: BigNumber.Value
   tokenId?: string
+  tokenSymbolOverrideId?: string
   showSymbol?: boolean
   showLocalAmount?: boolean
   hideSign?: boolean
@@ -45,6 +46,7 @@ interface Props {
 function TokenDisplay({
   amount,
   tokenId,
+  tokenSymbolOverrideId,
   showLocalAmount = true,
   showSymbol = true,
   showExplicitPositiveSign = false,
@@ -56,6 +58,7 @@ function TokenDisplay({
   errorFallback = '-',
 }: Props) {
   const tokenInfo = useTokenInfo(tokenId)
+  const tokenDisplayOverrideInfo = useTokenInfo(tokenSymbolOverrideId)
   const localCurrencyExchangeRate = useSelector(usdToLocalCurrencyRateSelector)
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
   const showError = showLocalAmount
@@ -87,7 +90,9 @@ function TokenDisplay({
           {amountToShow.isNaN()
             ? amountFallback
             : formatValueToDisplay(amountToShow.absoluteValue())}
-          {!showLocalAmount && showSymbol && ` ${tokenInfo?.symbol ?? ''}`}
+          {!showLocalAmount &&
+            showSymbol &&
+            ` ${tokenSymbolOverrideId ? tokenDisplayOverrideInfo?.symbol : (tokenInfo?.symbol ?? '')}`}
         </>
       )}
     </Text>
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 6f731111609..f1b0a66c707 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -111,9 +111,8 @@ function EarnEnterAmount({ route }: Props) {
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableFromTokens[0])
-  const [withdrawToken, _setWithdrawToken] = useState<TokenBalance>(() => withdrawTokens[0])
   const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
-    isWithdrawal ? withdrawToken : inputToken
+    isWithdrawal ? withdrawTokens[0] : inputToken
   )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -228,15 +227,7 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [
-    tokenAmountInput,
-    localAmountInput,
-    enteredIn,
-    inputToken,
-    mode,
-    withdrawToken,
-    transactionToken,
-  ])
+  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode, transactionToken])
 
   const feeCurrencies = useSelector((state) =>
     feeCurrenciesSelector(state, transactionToken.networkId)
@@ -256,7 +247,7 @@ function EarnEnterAmount({ route }: Props) {
       return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, inputToken, mode, withdrawToken, transactionToken, feeCurrencies])
+  }, [tokenAmount, inputToken, mode, transactionToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -584,7 +575,7 @@ function TransactionWithdrawDetails({
         />
         <View style={styles.txDetailsValue}>
           <TokenDisplay
-            tokenId={token.tokenId}
+            tokenId={pool.dataProps.withdrawTokenId}
             testID="EarnEnterAmount/Withdraw/Fiat"
             amount={pool.balance}
             showLocalAmount={true}
@@ -594,7 +585,8 @@ function TransactionWithdrawDetails({
             {'('}
             <TokenDisplay
               testID="EarnEnterAmount/Withdraw/Crypto"
-              tokenId={token.tokenId}
+              tokenId={pool.dataProps.withdrawTokenId}
+              tokenSymbolOverrideId={token.tokenId}
               amount={pool.balance}
               showLocalAmount={false}
             />

From 1dbf295fc4f4d4b0d5d378ec9fdc8161dbaeabbc Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 14:38:45 -0700
Subject: [PATCH 020/118] style: naming

---
 src/components/TokenDisplay.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TokenDisplay.tsx b/src/components/TokenDisplay.tsx
index 7e7c8f69369..0f0aed3636a 100644
--- a/src/components/TokenDisplay.tsx
+++ b/src/components/TokenDisplay.tsx
@@ -58,7 +58,7 @@ function TokenDisplay({
   errorFallback = '-',
 }: Props) {
   const tokenInfo = useTokenInfo(tokenId)
-  const tokenDisplayOverrideInfo = useTokenInfo(tokenSymbolOverrideId)
+  const tokenSymbolOverrideInfo = useTokenInfo(tokenSymbolOverrideId)
   const localCurrencyExchangeRate = useSelector(usdToLocalCurrencyRateSelector)
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
   const showError = showLocalAmount
@@ -92,7 +92,7 @@ function TokenDisplay({
             : formatValueToDisplay(amountToShow.absoluteValue())}
           {!showLocalAmount &&
             showSymbol &&
-            ` ${tokenSymbolOverrideId ? tokenDisplayOverrideInfo?.symbol : (tokenInfo?.symbol ?? '')}`}
+            ` ${tokenSymbolOverrideId ? tokenSymbolOverrideInfo?.symbol : (tokenInfo?.symbol ?? '')}`}
         </>
       )}
     </Text>

From ad16ffa211c766d7ec22d3ea835e6b5fbab1f210 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Fri, 11 Oct 2024 17:22:58 -0700
Subject: [PATCH 021/118] fix(earn): use withdraw token and adjust display

---
 src/earn/EarnEnterAmount.test.tsx |  2 +-
 src/earn/EarnEnterAmount.tsx      | 46 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 0fade8d4224..38b5cc1a03e 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -439,7 +439,7 @@ describe('EarnEnterAmount', () => {
         depositTokenId: mockArbUsdcTokenId,
         providerId: mockEarnPositions[0].appId,
         poolId: mockEarnPositions[0].positionId,
-        fromTokenId: mockArbUsdcTokenId,
+        fromTokenId: 'arbitrum-sepolia:0x460b97bd498e1157530aeb3086301d5225b91216',
         fromTokenAmount: '8',
         depositTokenAmount: '8',
         mode: 'withdraw',
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index f1b0a66c707..02adea9ea97 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -100,20 +100,18 @@ function EarnEnterAmount({ route }: Props) {
   const isWithdrawal = mode === 'withdraw'
   const { depositTokens, withdrawTokens, eligibleSwappableTokens } = useTokens({ pool })
 
-  const availableFromTokens = useMemo(() => {
+  const availableInputTokens = useMemo(() => {
     switch (mode) {
       case 'deposit':
-      case 'withdraw': // We want to show the deposit token in the dropdown for withdrawal
         return depositTokens
+      case 'withdraw':
+        return withdrawTokens
       case 'swap-deposit':
         return eligibleSwappableTokens
     }
   }, [mode])
 
-  const [inputToken, setInputToken] = useState<TokenBalance>(() => availableFromTokens[0])
-  const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
-    isWithdrawal ? withdrawTokens[0] : inputToken
-  )
+  const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -199,8 +197,8 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, transactionToken.tokenId)
-  const localToToken = useLocalToTokenAmount(parsedLocalAmount, transactionToken.tokenId)
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, inputToken.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, inputToken.tokenId)
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
@@ -227,11 +225,9 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode, transactionToken])
+  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode])
 
-  const feeCurrencies = useSelector((state) =>
-    feeCurrenciesSelector(state, transactionToken.networkId)
-  )
+  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, inputToken.networkId))
 
   useEffect(() => {
     clearPreparedTransactions()
@@ -239,15 +235,15 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(transactionToken.balance)
+      tokenAmount.isGreaterThan(inputToken.balance)
     ) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
+      return handleRefreshPreparedTransactions(tokenAmount, inputToken, feeCurrencies)
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, inputToken, mode, transactionToken, feeCurrencies])
+  }, [tokenAmount, inputToken, mode, inputToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -359,9 +355,9 @@ function EarnEnterAmount({ route }: Props) {
       default:
       case 'swap-deposit':
       case 'deposit':
-        return availableFromTokens.length > 1
+        return availableInputTokens.length > 1
     }
-  }, [mode, availableFromTokens, withdrawTokens, depositTokens])
+  }, [mode, availableInputTokens, withdrawTokens, depositTokens])
 
   return (
     <SafeAreaView style={styles.safeAreaContainer}>
@@ -392,8 +388,13 @@ function EarnEnterAmount({ route }: Props) {
                 testID="EarnEnterAmount/TokenSelect"
               >
                 <>
-                  <TokenIcon token={inputToken} size={IconSize.SMALL} />
-                  <Text style={styles.tokenName}>{inputToken.symbol}</Text>
+                  <TokenIcon
+                    token={isWithdrawal ? depositTokens[0] : inputToken}
+                    size={IconSize.SMALL}
+                  />
+                  <Text style={styles.tokenName}>
+                    {isWithdrawal ? depositTokens[0].symbol : inputToken.symbol}
+                  </Text>
                   {dropdownEnabled && <DownArrowIcon color={Colors.gray5} />}
                 </>
               </Touchable>
@@ -408,7 +409,7 @@ function EarnEnterAmount({ route }: Props) {
                 testID="EarnEnterAmount/LocalAmountInput"
                 editable={!!inputToken.priceUsd}
               />
-              {!transactionToken.balance.isZero() && (
+              {!inputToken.balance.isZero() && (
                 <Touchable
                   borderRadius={MAX_BORDER_RADIUS}
                   onPress={onMaxAmountPress}
@@ -544,7 +545,7 @@ function EarnEnterAmount({ route }: Props) {
         forwardedRef={tokenBottomSheetRef}
         origin={TokenPickerOrigin.Earn}
         onTokenSelected={onSelectToken}
-        tokens={availableFromTokens}
+        tokens={availableInputTokens}
         title={t('sendEnterAmountScreen.selectToken')}
         titleStyle={styles.title}
       />
@@ -554,7 +555,6 @@ function EarnEnterAmount({ route }: Props) {
 
 function TransactionWithdrawDetails({
   pool,
-  token,
   prepareTransactionsResult,
   feeDetailsBottomSheetRef,
 }: {
@@ -586,7 +586,7 @@ function TransactionWithdrawDetails({
             <TokenDisplay
               testID="EarnEnterAmount/Withdraw/Crypto"
               tokenId={pool.dataProps.withdrawTokenId}
-              tokenSymbolOverrideId={token.tokenId}
+              tokenSymbolOverrideId={pool.dataProps.depositTokenId}
               amount={pool.balance}
               showLocalAmount={false}
             />

From d6ef99a14d08c10f6ea71f1801a74c086d5ffbf7 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 09:20:39 -0700
Subject: [PATCH 022/118] chore: update root state schema

---
 test/RootStateSchema.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 677f42ce830..027654e61c1 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -1242,6 +1242,13 @@
                 "cantSeparateCompoundedInterest": {
                     "type": "boolean"
                 },
+                "claimType": {
+                    "enum": [
+                        "earnings",
+                        "rewards"
+                    ],
+                    "type": "string"
+                },
                 "contractCreatedAt": {
                     "type": "string"
                 },
@@ -1272,6 +1279,9 @@
                 "withdrawTokenId": {
                     "type": "string"
                 },
+                "withdrawalIncludesClaim": {
+                    "type": "boolean"
+                },
                 "yieldRates": {
                     "items": {
                         "$ref": "#/definitions/YieldRate"

From f5fecc5dd19bb5fc4accd16c14258e6818bf8f94 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 11:54:47 -0700
Subject: [PATCH 023/118] fix: show correct withdrawal amounts

---
 src/earn/EarnEnterAmount.test.tsx |  2 +-
 src/earn/EarnEnterAmount.tsx      | 60 ++++++++++++++++---------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 38b5cc1a03e..4c3802a5347 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -420,7 +420,7 @@ describe('EarnEnterAmount', () => {
       await waitFor(() => expect(getByText('earnFlow.enterAmount.continue')).not.toBeDisabled())
 
       expect(getByTestId('EarnEnterAmount/Withdraw/Crypto')).toBeTruthy()
-      expect(getByTestId('EarnEnterAmount/Withdraw/Crypto')).toHaveTextContent('10.00 USDC')
+      expect(getByTestId('EarnEnterAmount/Withdraw/Crypto')).toHaveTextContent('11.00 USDC')
 
       expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
       expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 02adea9ea97..c18d6eafc1d 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -103,15 +103,17 @@ function EarnEnterAmount({ route }: Props) {
   const availableInputTokens = useMemo(() => {
     switch (mode) {
       case 'deposit':
-        return depositTokens
       case 'withdraw':
-        return withdrawTokens
+        return depositTokens
       case 'swap-deposit':
         return eligibleSwappableTokens
     }
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
+  const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
+    isWithdrawal ? withdrawTokens[0] : inputToken
+  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -131,9 +133,9 @@ function EarnEnterAmount({ route }: Props) {
   const onTokenPickerSelect = () => {
     tokenBottomSheetRef.current?.snapToIndex(0)
     AppAnalytics.track(SendEvents.token_dropdown_opened, {
-      currentTokenId: inputToken.tokenId,
-      currentTokenAddress: inputToken.address,
-      currentNetworkId: inputToken.networkId,
+      currentTokenId: transactionToken.tokenId,
+      currentTokenAddress: transactionToken.address,
+      currentNetworkId: transactionToken.networkId,
     })
   }
 
@@ -197,8 +199,8 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, inputToken.tokenId)
-  const localToToken = useLocalToTokenAmount(parsedLocalAmount, inputToken.tokenId)
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, transactionToken.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, transactionToken.tokenId)
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
@@ -216,7 +218,7 @@ function EarnEnterAmount({ route }: Props) {
         localToToken && localToToken.gt(0)
           ? // no group separator for token amount, round to token.decimals and strip trailing zeros
             localToToken
-              .toFormat(inputToken.decimals, { decimalSeparator })
+              .toFormat(transactionToken.decimals, { decimalSeparator })
               .replace(new RegExp(`[${decimalSeparator}]?0+$`), '')
           : ''
       )
@@ -225,9 +227,11 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken, mode])
+  }, [tokenAmountInput, localAmountInput, enteredIn, transactionToken, mode])
 
-  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, inputToken.networkId))
+  const feeCurrencies = useSelector((state) =>
+    feeCurrenciesSelector(state, transactionToken.networkId)
+  )
 
   useEffect(() => {
     clearPreparedTransactions()
@@ -235,22 +239,22 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(inputToken.balance)
+      tokenAmount.isGreaterThan(transactionToken.balance)
     ) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(tokenAmount, inputToken, feeCurrencies)
+      return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
-  }, [tokenAmount, inputToken, mode, inputToken, feeCurrencies])
+  }, [tokenAmount, mode, transactionToken, feeCurrencies])
 
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
   const isAmountLessThanBalance = isWithdrawal
     ? tokenAmount && tokenAmount.lte(pool.balance)
-    : tokenAmount && tokenAmount.lte(inputToken.balance)
+    : tokenAmount && tokenAmount.lte(transactionToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -310,34 +314,34 @@ function EarnEnterAmount({ route }: Props) {
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
     if (isWithdrawal) {
-      setTokenAmountInput(new BigNumber(pool.balance).toFormat({ decimalSeparator }))
+      setTokenAmountInput(new BigNumber(transactionToken.balance).toFormat({ decimalSeparator }))
     } else {
-      setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
+      setTokenAmountInput(transactionToken.balance.toFormat({ decimalSeparator }))
     }
     setEnteredIn('token')
     setMaxPressed(true)
     tokenAmountInputRef.current?.blur()
     localAmountInputRef.current?.blur()
     AppAnalytics.track(SendEvents.max_pressed, {
-      tokenId: inputToken.tokenId,
-      tokenAddress: inputToken.address,
-      networkId: inputToken.networkId,
+      tokenId: transactionToken.tokenId,
+      tokenAddress: transactionToken.address,
+      networkId: transactionToken.networkId,
     })
   }
 
   const onPressContinue = () => {
-    if (!tokenAmount || !inputToken) {
+    if (!tokenAmount || !transactionToken) {
       // should never happen
       return
     }
     AppAnalytics.track(EarnEvents.earn_enter_amount_continue_press, {
-      amountInUsd: tokenAmount.multipliedBy(inputToken.priceUsd ?? 0).toFixed(2),
+      amountInUsd: tokenAmount.multipliedBy(transactionToken.priceUsd ?? 0).toFixed(2),
       amountEnteredIn: enteredIn,
       depositTokenId: pool.dataProps.depositTokenId,
-      networkId: inputToken.networkId,
+      networkId: transactionToken.networkId,
       providerId: pool.appId,
       poolId: pool.positionId,
-      fromTokenId: inputToken.tokenId,
+      fromTokenId: transactionToken.tokenId,
       fromTokenAmount: tokenAmount.toString(),
       mode,
       depositTokenAmount: swapTransaction
@@ -401,15 +405,15 @@ function EarnEnterAmount({ route }: Props) {
             </View>
             <View style={styles.localAmountRow}>
               <AmountInput
-                inputValue={inputToken.priceUsd ? localAmountInput : '-'}
+                inputValue={transactionToken.priceUsd ? localAmountInput : '-'}
                 onInputChange={onLocalAmountInputChange}
                 inputRef={localAmountInputRef}
                 inputStyle={styles.localAmount}
                 placeholder={`${localCurrencySymbol}${new BigNumber(0).toFormat(2)}`}
                 testID="EarnEnterAmount/LocalAmountInput"
-                editable={!!inputToken.priceUsd}
+                editable={!!transactionToken.priceUsd}
               />
-              {!inputToken.balance.isZero() && (
+              {!transactionToken.balance.isZero() && (
                 <Touchable
                   borderRadius={MAX_BORDER_RADIUS}
                   onPress={onMaxAmountPress}
@@ -435,7 +439,7 @@ function EarnEnterAmount({ route }: Props) {
           {tokenAmount && isWithdrawal && (
             <TransactionWithdrawDetails
               pool={pool}
-              token={inputToken}
+              token={transactionToken}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
             />
@@ -587,7 +591,7 @@ function TransactionWithdrawDetails({
               testID="EarnEnterAmount/Withdraw/Crypto"
               tokenId={pool.dataProps.withdrawTokenId}
               tokenSymbolOverrideId={pool.dataProps.depositTokenId}
-              amount={pool.balance}
+              amount={new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0])}
               showLocalAmount={false}
             />
             {')'}

From 3879b5208619d15c7160112d60efe34ba9a23426 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 12:10:42 -0700
Subject: [PATCH 024/118] fix: use correct fiat value display

---
 src/earn/EarnEnterAmount.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index c18d6eafc1d..313ca3520bc 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -579,9 +579,9 @@ function TransactionWithdrawDetails({
         />
         <View style={styles.txDetailsValue}>
           <TokenDisplay
-            tokenId={pool.dataProps.withdrawTokenId}
+            tokenId={pool.dataProps.depositTokenId}
             testID="EarnEnterAmount/Withdraw/Fiat"
-            amount={pool.balance}
+            amount={new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0])}
             showLocalAmount={true}
             style={styles.txDetailsValueText}
           />

From 9b29dfb66a4f6a618138b8af19184c8a63ddb389 Mon Sep 17 00:00:00 2001
From: Tom McGuire <mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 12:26:59 -0700
Subject: [PATCH 025/118] test(earn): show correct local amount

---
 src/earn/EarnEnterAmount.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 4c3802a5347..a1f56a7f8b2 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -424,7 +424,7 @@ describe('EarnEnterAmount', () => {
 
       expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
       expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toBeTruthy()
-      expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toHaveTextContent('₱13.30')
+      expect(getByTestId('EarnEnterAmount/Withdraw/Fiat')).toHaveTextContent('₱14.63')
 
       expect(getByTestId('EarnEnterAmount/Fees')).toBeTruthy()
       expect(getByTestId('EarnEnterAmount/Fees')).toHaveTextContent('₱0.012')

From 9ed4dfc5a8d3109106434bbce20a1926dbabd90e Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 18:07:51 -0700
Subject: [PATCH 026/118] fix(earn): deposits should use input token

---
 src/earn/EarnEnterAmount.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 313ca3520bc..24c5531a046 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -314,9 +314,9 @@ function EarnEnterAmount({ route }: Props) {
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
     if (isWithdrawal) {
-      setTokenAmountInput(new BigNumber(transactionToken.balance).toFormat({ decimalSeparator }))
-    } else {
       setTokenAmountInput(transactionToken.balance.toFormat({ decimalSeparator }))
+    } else {
+      setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
     }
     setEnteredIn('token')
     setMaxPressed(true)

From 7b20e2d1456dfef58e3ee7ae1b85c4be1bb5b26c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 14 Oct 2024 19:10:25 -0700
Subject: [PATCH 027/118] fix(earn): use deposit token amounts in token input

---
 src/earn/EarnEnterAmount.tsx | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 24c5531a046..4fe392d9fef 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -199,8 +199,14 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, transactionToken.tokenId)
-  const localToToken = useLocalToTokenAmount(parsedLocalAmount, transactionToken.tokenId)
+  const tokenToLocal = useTokenToLocalAmount(
+    parsedTokenAmount,
+    isWithdrawal ? inputToken.tokenId : transactionToken.tokenId
+  )
+  const localToToken = useLocalToTokenAmount(
+    parsedLocalAmount,
+    isWithdrawal ? inputToken.tokenId : transactionToken.tokenId
+  )
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {
@@ -239,7 +245,12 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(transactionToken.balance)
+      tokenAmount.isLessThanOrEqualTo(0) ||
+      tokenAmount.isGreaterThan(
+        isWithdrawal
+          ? transactionToken.balance.multipliedBy(pool.pricePerShare[0])
+          : transactionToken.balance
+      )
     ) {
       return
     }
@@ -253,7 +264,8 @@ function EarnEnterAmount({ route }: Props) {
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
   const isAmountLessThanBalance = isWithdrawal
-    ? tokenAmount && tokenAmount.lte(pool.balance)
+    ? tokenAmount &&
+      tokenAmount.lte(new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0]))
     : tokenAmount && tokenAmount.lte(transactionToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
@@ -314,7 +326,9 @@ function EarnEnterAmount({ route }: Props) {
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
     if (isWithdrawal) {
-      setTokenAmountInput(transactionToken.balance.toFormat({ decimalSeparator }))
+      setTokenAmountInput(
+        transactionToken.balance.multipliedBy(pool.pricePerShare[0]).toFormat({ decimalSeparator })
+      )
     } else {
       setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
     }

From 6ed3c091ee8f142c9c64b5e216a40d4e48ca8658 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 00:01:19 -0700
Subject: [PATCH 028/118] style(earn): use transaction token balance instead of
 pool balance

---
 src/components/TokenDisplay.tsx   |  7 +------
 src/earn/EarnEnterAmount.test.tsx |  5 +++++
 src/earn/EarnEnterAmount.tsx      | 13 +++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/TokenDisplay.tsx b/src/components/TokenDisplay.tsx
index 0f0aed3636a..af73654482f 100644
--- a/src/components/TokenDisplay.tsx
+++ b/src/components/TokenDisplay.tsx
@@ -31,7 +31,6 @@ export function formatValueToDisplay(value: BigNumber) {
 interface Props {
   amount: BigNumber.Value
   tokenId?: string
-  tokenSymbolOverrideId?: string
   showSymbol?: boolean
   showLocalAmount?: boolean
   hideSign?: boolean
@@ -46,7 +45,6 @@ interface Props {
 function TokenDisplay({
   amount,
   tokenId,
-  tokenSymbolOverrideId,
   showLocalAmount = true,
   showSymbol = true,
   showExplicitPositiveSign = false,
@@ -58,7 +56,6 @@ function TokenDisplay({
   errorFallback = '-',
 }: Props) {
   const tokenInfo = useTokenInfo(tokenId)
-  const tokenSymbolOverrideInfo = useTokenInfo(tokenSymbolOverrideId)
   const localCurrencyExchangeRate = useSelector(usdToLocalCurrencyRateSelector)
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
   const showError = showLocalAmount
@@ -90,9 +87,7 @@ function TokenDisplay({
           {amountToShow.isNaN()
             ? amountFallback
             : formatValueToDisplay(amountToShow.absoluteValue())}
-          {!showLocalAmount &&
-            showSymbol &&
-            ` ${tokenSymbolOverrideId ? tokenSymbolOverrideInfo?.symbol : (tokenInfo?.symbol ?? '')}`}
+          {!showLocalAmount && showSymbol && ` ${tokenInfo?.symbol ?? ''}`}
         </>
       )}
     </Text>
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index a1f56a7f8b2..e3b3decaa94 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -21,6 +21,7 @@ import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
 import { createMockStore } from 'test/utils'
 import {
+  mockAaveArbUsdcTokenId,
   mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
@@ -125,6 +126,10 @@ const store = createMockStore({
         minimumAppVersionToSwap: '1.0.0',
         balance: '1',
       },
+      mockAaveArbUsdcTokenId: {
+        ...mockTokenBalances[mockAaveArbUsdcTokenId],
+        balance: '10',
+      },
     },
   },
 })
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 4fe392d9fef..a42d3fa2b40 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -264,8 +264,7 @@ function EarnEnterAmount({ route }: Props) {
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
   const isAmountLessThanBalance = isWithdrawal
-    ? tokenAmount &&
-      tokenAmount.lte(new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0]))
+    ? tokenAmount && tokenAmount.lte(transactionToken.balance.multipliedBy(pool.pricePerShare[0]))
     : tokenAmount && tokenAmount.lte(transactionToken.balance)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
@@ -456,6 +455,7 @@ function EarnEnterAmount({ route }: Props) {
               token={transactionToken}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
+              transactionToken={transactionToken}
             />
           )}
         </View>
@@ -575,11 +575,13 @@ function TransactionWithdrawDetails({
   pool,
   prepareTransactionsResult,
   feeDetailsBottomSheetRef,
+  transactionToken,
 }: {
   pool: EarnPosition
   token: TokenBalance
   prepareTransactionsResult?: PreparedTransactionsResult
   feeDetailsBottomSheetRef: React.RefObject<BottomSheetModalRefType>
+  transactionToken: TokenBalance
 }) {
   const { t } = useTranslation()
   const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -595,7 +597,7 @@ function TransactionWithdrawDetails({
           <TokenDisplay
             tokenId={pool.dataProps.depositTokenId}
             testID="EarnEnterAmount/Withdraw/Fiat"
-            amount={new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0])}
+            amount={transactionToken.balance.multipliedBy(pool.pricePerShare[0])}
             showLocalAmount={true}
             style={styles.txDetailsValueText}
           />
@@ -603,9 +605,8 @@ function TransactionWithdrawDetails({
             {'('}
             <TokenDisplay
               testID="EarnEnterAmount/Withdraw/Crypto"
-              tokenId={pool.dataProps.withdrawTokenId}
-              tokenSymbolOverrideId={pool.dataProps.depositTokenId}
-              amount={new BigNumber(pool.balance).multipliedBy(pool.pricePerShare[0])}
+              tokenId={pool.dataProps.depositTokenId}
+              amount={transactionToken.balance.multipliedBy(pool.pricePerShare[0])}
               showLocalAmount={false}
             />
             {')'}

From ca51c7da6d3825f0d992da33fe27c3218a780247 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 00:05:30 -0700
Subject: [PATCH 029/118] test(earn): clean-up mock pool params

---
 src/earn/EarnEnterAmount.test.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index e3b3decaa94..e16e4ae3948 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -383,9 +383,7 @@ describe('EarnEnterAmount', () => {
 
   describe('withdraw', () => {
     // Pool balance should be set to determine available withdrawal amount
-    const withdrawalPool = mockEarnPositions[0]
-    withdrawalPool.balance = '10'
-    const withdrawParams = { pool: withdrawalPool, mode: 'withdraw' }
+    const withdrawParams = { ...params, mode: 'withdraw' }
 
     beforeEach(() => {
       jest.clearAllMocks()

From 4bd8d6287d814f91501b4f0a3edb2c2c36e0d973 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 12:08:18 -0700
Subject: [PATCH 030/118] Apply suggestions from code review

Co-authored-by: Jacob Waterman <jacobrwaterman@gmail.com>
---
 src/earn/EarnEnterAmount.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index e16e4ae3948..2f3974030e7 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -398,7 +398,7 @@ describe('EarnEnterAmount', () => {
         isPreparingTransactions: false,
       })
     })
-    it('should show only the withdrawal token and not include the token dropdown', async () => {
+    it('should show only the deposit token and not include the token dropdown', async () => {
       const { getByTestId, queryByTestId } = render(
         <Provider store={store}>
           <MockedNavigator component={EarnEnterAmount} params={withdrawParams} />

From 1f1db1e072ce91ba1a3d84c8ae021edfdae23bdc Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 12:13:52 -0700
Subject: [PATCH 031/118] style(earn): rename inputToken to depositToken in
 useTokens

---
 src/earn/EarnEnterAmount.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index a42d3fa2b40..d4eee2fdc34 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -59,7 +59,7 @@ const MAX_BORDER_RADIUS = 96
 const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
 
 function useTokens({ pool }: { pool: EarnPosition }) {
-  const inputToken = useTokenInfo(pool.dataProps.depositTokenId)
+  const depositToken = useTokenInfo(pool.dataProps.depositTokenId)
   const withdrawToken = useTokenInfo(pool.dataProps.withdrawTokenId)
   const swappableTokens = useSelector((state) =>
     swappableFromTokensByNetworkIdSelector(state, [pool.networkId])
@@ -76,7 +76,7 @@ function useTokens({ pool }: { pool: EarnPosition }) {
     [swappableTokens, pool.dataProps.depositTokenId, pool.dataProps.withdrawTokenId]
   )
 
-  if (!inputToken) {
+  if (!depositToken) {
     // should never happen
     throw new Error(`Token info not found for token ID ${pool.dataProps.depositTokenId}`)
   }
@@ -87,7 +87,7 @@ function useTokens({ pool }: { pool: EarnPosition }) {
   }
 
   return {
-    depositTokens: [inputToken],
+    depositTokens: [depositToken],
     withdrawTokens: [withdrawToken],
     eligibleSwappableTokens: eligibleSwappableTokens,
   }

From 819e297efa5c2cd0d90eac1191be18697442059e Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 12:14:24 -0700
Subject: [PATCH 032/118] fix(earn): set transaction token on token select for
 deposits

---
 src/earn/EarnEnterAmount.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index d4eee2fdc34..f6ebb658a02 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -111,7 +111,7 @@ function EarnEnterAmount({ route }: Props) {
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
-  const [transactionToken, _setTransactionToken] = useState<TokenBalance>(() =>
+  const [transactionToken, setTransactionToken] = useState<TokenBalance>(() =>
     isWithdrawal ? withdrawTokens[0] : inputToken
   )
 
@@ -141,6 +141,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const onSelectToken = (token: TokenBalance) => {
     setInputToken(token)
+    if (!isWithdrawal) setTransactionToken(token)
     tokenBottomSheetRef.current?.close()
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }

From 9c6a05d9f08d1327e182c44c5ae0d5cb85194ce7 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 12:27:55 -0700
Subject: [PATCH 033/118] fix(earn): display withdrawal text on fee bottom
 sheet

---
 locales/base/translation.json | 1 +
 src/earn/EarnEnterAmount.tsx  | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 90252fbcf58..b2fc750f3f6 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2578,6 +2578,7 @@
         "estNetworkFee": "Est. Network Fee",
         "maxNetworkFee": "Max Network Fee",
         "networkFeeDescription": "The network fee is required by the network to process the deposit transaction.",
+        "networkFeeDescriptionWithdrawal": "The network fee is required by the network to process the withdrawal transaction.",
         "networkSwapFeeDescription": "The network fee is required by the network to process the deposit transactions. The {{appName}} fee of {{appFeePercentage}}% is charged for your use of our product.",
         "appSwapFee": "{{appName}} Fee"
       },
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index f6ebb658a02..062a84bcec4 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -536,6 +536,7 @@ function EarnEnterAmount({ route }: Props) {
           pool={pool}
           token={inputToken}
           tokenAmount={tokenAmount}
+          isWithdrawal={isWithdrawal}
         />
       )}
       {swapTransaction && tokenAmount && (
@@ -754,6 +755,7 @@ function FeeDetailsBottomSheet({
   pool,
   token,
   tokenAmount,
+  isWithdrawal,
 }: {
   forwardedRef: React.RefObject<BottomSheetModalRefType>
   testID: string
@@ -764,6 +766,7 @@ function FeeDetailsBottomSheet({
   pool: EarnPosition
   token: TokenBalance
   tokenAmount: BigNumber
+  isWithdrawal: boolean
 }) {
   const { t } = useTranslation()
   const inputToken = useTokenInfo(pool.dataProps.depositTokenId)
@@ -866,7 +869,9 @@ function FeeDetailsBottomSheet({
             </Text>
           ) : (
             <Text style={styles.bottomSheetDescriptionText}>
-              {t('earnFlow.enterAmount.feeBottomSheet.networkFeeDescription')}
+              {isWithdrawal
+                ? t('earnFlow.enterAmount.feeBottomSheet.networkFeeDescriptionWithdrawal')
+                : t('earnFlow.enterAmount.feeBottomSheet.networkFeeDescription')}
             </Text>
           )}
         </View>

From 1da7fac29afd55d61d0717cdc66e28568f4cdca2 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 15:24:54 -0700
Subject: [PATCH 034/118] chore: pr feedback

---
 src/analytics/Properties.tsx |  1 +
 src/earn/EarnEnterAmount.tsx | 18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 297a2e61a34..7d5514d9d14 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -590,6 +590,7 @@ interface SendEventsProperties {
     tokenId: string
     tokenAddress: string | null
     networkId: NetworkId | null
+    mode?: EarnEnterMode
   }
   [SendEvents.swap_input_pressed]: {
     swapToLocalAmount: boolean
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 062a84bcec4..8b187f9e996 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -133,9 +133,9 @@ function EarnEnterAmount({ route }: Props) {
   const onTokenPickerSelect = () => {
     tokenBottomSheetRef.current?.snapToIndex(0)
     AppAnalytics.track(SendEvents.token_dropdown_opened, {
-      currentTokenId: transactionToken.tokenId,
-      currentTokenAddress: transactionToken.address,
-      currentNetworkId: transactionToken.networkId,
+      currentTokenId: inputToken.tokenId,
+      currentTokenAddress: inputToken.address,
+      currentNetworkId: inputToken.networkId,
     })
   }
 
@@ -340,6 +340,7 @@ function EarnEnterAmount({ route }: Props) {
       tokenId: transactionToken.tokenId,
       tokenAddress: transactionToken.address,
       networkId: transactionToken.networkId,
+      mode,
     })
   }
 
@@ -370,9 +371,9 @@ function EarnEnterAmount({ route }: Props) {
     switch (mode) {
       case 'withdraw':
         return withdrawTokens.length > 1
-      default:
       case 'swap-deposit':
       case 'deposit':
+      default:
         return availableInputTokens.length > 1
     }
   }, [mode, availableInputTokens, withdrawTokens, depositTokens])
@@ -406,13 +407,8 @@ function EarnEnterAmount({ route }: Props) {
                 testID="EarnEnterAmount/TokenSelect"
               >
                 <>
-                  <TokenIcon
-                    token={isWithdrawal ? depositTokens[0] : inputToken}
-                    size={IconSize.SMALL}
-                  />
-                  <Text style={styles.tokenName}>
-                    {isWithdrawal ? depositTokens[0].symbol : inputToken.symbol}
-                  </Text>
+                  <TokenIcon token={inputToken} size={IconSize.SMALL} />
+                  <Text style={styles.tokenName}>{inputToken.symbol}</Text>
                   {dropdownEnabled && <DownArrowIcon color={Colors.gray5} />}
                 </>
               </Touchable>

From 686a01c922903dd3e1736f5b9a1ced0b40a44c76 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 17:01:21 -0700
Subject: [PATCH 035/118] style: create reusable const
 balanceInTransactionToken

---
 src/earn/EarnEnterAmount.tsx | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 8b187f9e996..1b1e0085eb5 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -240,6 +240,14 @@ function EarnEnterAmount({ route }: Props) {
     feeCurrenciesSelector(state, transactionToken.networkId)
   )
 
+  const balanceInTransactionToken = useMemo(
+    () =>
+      isWithdrawal
+        ? transactionToken.balance.multipliedBy(pool.pricePerShare[0])
+        : transactionToken.balance,
+    [transactionToken, pool, mode]
+  )
+
   useEffect(() => {
     clearPreparedTransactions()
 
@@ -247,11 +255,7 @@ function EarnEnterAmount({ route }: Props) {
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(
-        isWithdrawal
-          ? transactionToken.balance.multipliedBy(pool.pricePerShare[0])
-          : transactionToken.balance
-      )
+      tokenAmount.isGreaterThan(balanceInTransactionToken)
     ) {
       return
     }
@@ -264,9 +268,7 @@ function EarnEnterAmount({ route }: Props) {
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
-  const isAmountLessThanBalance = isWithdrawal
-    ? tokenAmount && tokenAmount.lte(transactionToken.balance.multipliedBy(pool.pricePerShare[0]))
-    : tokenAmount && tokenAmount.lte(transactionToken.balance)
+  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(balanceInTransactionToken)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -326,9 +328,7 @@ function EarnEnterAmount({ route }: Props) {
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
     if (isWithdrawal) {
-      setTokenAmountInput(
-        transactionToken.balance.multipliedBy(pool.pricePerShare[0]).toFormat({ decimalSeparator })
-      )
+      setTokenAmountInput(balanceInTransactionToken.toFormat({ decimalSeparator }))
     } else {
       setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
     }
@@ -452,7 +452,7 @@ function EarnEnterAmount({ route }: Props) {
               token={transactionToken}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
-              transactionToken={transactionToken}
+              balanceInTransactionToken={balanceInTransactionToken}
             />
           )}
         </View>
@@ -573,13 +573,13 @@ function TransactionWithdrawDetails({
   pool,
   prepareTransactionsResult,
   feeDetailsBottomSheetRef,
-  transactionToken,
+  balanceInTransactionToken,
 }: {
   pool: EarnPosition
   token: TokenBalance
   prepareTransactionsResult?: PreparedTransactionsResult
   feeDetailsBottomSheetRef: React.RefObject<BottomSheetModalRefType>
-  transactionToken: TokenBalance
+  balanceInTransactionToken: BigNumber
 }) {
   const { t } = useTranslation()
   const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -595,7 +595,7 @@ function TransactionWithdrawDetails({
           <TokenDisplay
             tokenId={pool.dataProps.depositTokenId}
             testID="EarnEnterAmount/Withdraw/Fiat"
-            amount={transactionToken.balance.multipliedBy(pool.pricePerShare[0])}
+            amount={balanceInTransactionToken}
             showLocalAmount={true}
             style={styles.txDetailsValueText}
           />
@@ -604,7 +604,7 @@ function TransactionWithdrawDetails({
             <TokenDisplay
               testID="EarnEnterAmount/Withdraw/Crypto"
               tokenId={pool.dataProps.depositTokenId}
-              amount={transactionToken.balance.multipliedBy(pool.pricePerShare[0])}
+              amount={balanceInTransactionToken}
               showLocalAmount={false}
             />
             {')'}

From 2681ce6da8c6fabde8e143106aa3dde5a533114a Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 17:19:48 -0700
Subject: [PATCH 036/118] style: use input token directly

---
 src/earn/EarnEnterAmount.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 1b1e0085eb5..a2d030c0a11 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -200,14 +200,8 @@ function EarnEnterAmount({ route }: Props) {
     [localAmountInput]
   )
 
-  const tokenToLocal = useTokenToLocalAmount(
-    parsedTokenAmount,
-    isWithdrawal ? inputToken.tokenId : transactionToken.tokenId
-  )
-  const localToToken = useLocalToTokenAmount(
-    parsedLocalAmount,
-    isWithdrawal ? inputToken.tokenId : transactionToken.tokenId
-  )
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, inputToken.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, inputToken.tokenId)
 
   const { tokenAmount } = useMemo(() => {
     if (enteredIn === 'token') {

From 24c47be2e5d250b88f07fba17dee96cbebe7d566 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 18:38:54 -0700
Subject: [PATCH 037/118] fix(earn): use converted token amount in withdrawals

---
 src/earn/EarnEnterAmount.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index a2d030c0a11..0f67d1189bd 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -254,7 +254,11 @@ function EarnEnterAmount({ route }: Props) {
       return
     }
     const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(tokenAmount, transactionToken, feeCurrencies)
+      return handleRefreshPreparedTransactions(
+        isWithdrawal ? tokenAmount.multipliedBy(pool.pricePerShare[0]) : tokenAmount,
+        transactionToken,
+        feeCurrencies
+      )
     }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
     return () => clearTimeout(debouncedRefreshTransactions)
   }, [tokenAmount, mode, transactionToken, feeCurrencies])

From d6a16162e1dcf29edc25efbe97dc099f38d8f0b7 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 15 Oct 2024 19:01:32 -0700
Subject: [PATCH 038/118] fix(earn): convert withdrawal amount correctly usd
 for analytics

---
 src/earn/EarnEnterAmount.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 0f67d1189bd..ee118942579 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -348,7 +348,9 @@ function EarnEnterAmount({ route }: Props) {
       return
     }
     AppAnalytics.track(EarnEvents.earn_enter_amount_continue_press, {
-      amountInUsd: tokenAmount.multipliedBy(transactionToken.priceUsd ?? 0).toFixed(2),
+      amountInUsd: isWithdrawal
+        ? tokenAmount.multipliedBy(inputToken.priceUsd ?? 0).toFixed(2)
+        : tokenAmount.multipliedBy(transactionToken.priceUsd ?? 0).toFixed(2),
       amountEnteredIn: enteredIn,
       depositTokenId: pool.dataProps.depositTokenId,
       networkId: transactionToken.networkId,

From 2a2953486220331ed74cd0efca4bd5fcb22ed677 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 09:52:49 -0700
Subject: [PATCH 039/118] chore: remove unused export

---
 src/positions/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/positions/types.ts b/src/positions/types.ts
index 72a5786da35..ad5bce1c693 100644
--- a/src/positions/types.ts
+++ b/src/positions/types.ts
@@ -41,7 +41,7 @@ interface EarnDataProps {
   // We'll add more fields here as needed
 }
 
-export type ClaimType = 'earnings' | 'rewards'
+type ClaimType = 'earnings' | 'rewards'
 
 export type EarnPosition = AppTokenPosition & { dataProps: EarnDataProps }
 

From 7336c69a4046ca8ad26aef6733fca55112574911 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 11:24:32 -0700
Subject: [PATCH 040/118] fix(earn-confirmation): pass correct token amount

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 26e7eb92c2b..4e883516b66 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -368,7 +368,7 @@ function EarnEnterAmount({ route }: Props) {
       navigate(Screens.EarnConfirmationScreen, {
         pool,
         mode,
-        inputAmount: tokenAmount.toString(),
+        inputAmount: tokenAmount.dividedBy(pool.pricePerShare[0] ?? 0).toString(),
       })
     } else {
       reviewBottomSheetRef.current?.snapToIndex(0)

From 5d960afb63535eb7b0194595ea9a8c150ec7cd47 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 13:55:00 -0700
Subject: [PATCH 041/118] feat(earn): support partial withdrawals with claim
 and withdraw

---
 src/earn/EarnConfirmationScreen.test.tsx |  1 +
 src/earn/EarnConfirmationScreen.tsx      | 22 ++++++++++++----------
 src/earn/EarnEnterAmount.tsx             |  1 +
 src/earn/prepareTransactions.ts          |  6 ++++--
 src/earn/saga.ts                         |  5 +++--
 src/earn/types.ts                        |  3 +++
 src/navigator/types.tsx                  |  1 +
 7 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 52cf1950c38..7801f3a04fb 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -225,6 +225,7 @@ describe('EarnConfirmationScreen', () => {
       {
         type: withdrawStart.type,
         payload: {
+          amount: '11.825',
           pool: mockEarnPositions[0],
           preparedTransactions: getSerializablePreparedTransactions(
             mockPreparedTransaction.transactions
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 475e035ded0..2ec28c6495d 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -39,7 +39,7 @@ type Props = NativeStackScreenProps<StackParamList, Screens.EarnConfirmationScre
 export default function EarnConfirmationScreen({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
-  const { pool, mode, inputAmount } = route.params
+  const { pool, mode, inputAmount, useMax } = route.params
   const { depositTokenId, withdrawTokenId, rewardsPositionIds } = pool.dataProps
   const withdrawStatus = useSelector(withdrawStatusSelector)
   const rewardsPositions = useSelector(positionsWithBalanceSelector).filter((position) =>
@@ -69,27 +69,28 @@ export default function EarnConfirmationScreen({ route }: Props) {
 
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
 
-  // TODO(tomm): this should handle partial withdrawals
+  const withdrawAmountInDepositToken = useMemo(() => {
+    if (inputAmount) {
+      return new BigNumber(inputAmount).multipliedBy(pool.pricePerShare[0] ?? 1)
+    } else {
+      return withdrawToken.balance.multipliedBy(pool.pricePerShare[0] ?? 1)
+    }
+  }, [withdrawToken, pool.pricePerShare, inputAmount])
+
   const {
     result: prepareTransactionsResult,
     loading: isPreparingTransactions,
     error: prepareTransactionError,
   } = usePrepareWithdrawAndClaimTransactions({
+    amount: withdrawAmountInDepositToken.toString(),
     pool,
     walletAddress,
     feeCurrencies,
     hooksApiUrl,
     rewardsPositions,
+    useMax,
   })
 
-  const withdrawAmountInDepositToken = useMemo(() => {
-    if (inputAmount) {
-      return new BigNumber(inputAmount).multipliedBy(pool.pricePerShare[0] ?? 1)
-    } else {
-      return withdrawToken.balance.multipliedBy(pool.pricePerShare[0] ?? 1)
-    }
-  }, [withdrawToken, pool.pricePerShare, inputAmount])
-
   const onPress = () => {
     if (prepareTransactionsResult?.type !== 'possible') {
       // should never happen because button is disabled if withdraw is not possible
@@ -103,6 +104,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
         ),
         rewardsTokens,
         pool,
+        amount: withdrawAmountInDepositToken.toString(),
       })
     )
 
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 4e883516b66..d8267ca35eb 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -369,6 +369,7 @@ function EarnEnterAmount({ route }: Props) {
         pool,
         mode,
         inputAmount: tokenAmount.dividedBy(pool.pricePerShare[0] ?? 0).toString(),
+        useMax: maxPressed,
       })
     } else {
       reviewBottomSheetRef.current?.snapToIndex(0)
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 41cea7fde59..88b5798f05e 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -99,6 +99,8 @@ export async function prepareWithdrawAndClaimTransactions({
   feeCurrencies,
   hooksApiUrl,
   rewardsPositions,
+  amount,
+  useMax = true,
 }: PrepareWithdrawAndClaimParams) {
   const { dataProps, balance, appId, networkId, shortcutTriggerArgs } = pool
   const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
@@ -110,8 +112,8 @@ export async function prepareWithdrawAndClaimTransactions({
       tokens: [
         {
           tokenId: dataProps.withdrawTokenId,
-          amount: balance,
-          useMax: true,
+          amount: useMax ? balance : amount,
+          useMax,
         },
       ],
       ...shortcutTriggerArgs?.withdraw,
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index ae2dc98eae8..97edef4352f 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -310,6 +310,7 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
     pool,
     preparedTransactions: serializablePreparedTransactions,
     rewardsTokens,
+    amount,
   } = action.payload
   const tokenId = pool.dataProps.depositTokenId
 
@@ -356,11 +357,11 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
         networkId,
         type: TokenTransactionTypeV2.EarnWithdraw,
         inAmount: {
-          value: pool.balance,
+          value: amount ?? pool.balance,
           tokenId,
         },
         outAmount: {
-          value: pool.balance,
+          value: amount ?? pool.balance,
           tokenId: pool.dataProps.withdrawTokenId,
         },
         transactionHash,
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 457076fde44..189fcf9366e 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -26,6 +26,7 @@ export interface SerializableRewardsInfo {
 }
 
 export interface WithdrawInfo {
+  amount?: string
   pool: EarnPosition
   preparedTransactions: SerializableTransactionRequest[]
   rewardsTokens: Token[]
@@ -46,6 +47,8 @@ export interface PrepareWithdrawAndClaimParams {
   feeCurrencies: TokenBalance[]
   hooksApiUrl: string
   rewardsPositions: Position[]
+  amount?: string
+  useMax?: boolean
 }
 
 export enum BeforeDepositActionName {
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index ff3dc96d117..d9508ec6451 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -87,6 +87,7 @@ export type StackParamList = {
     pool: EarnPosition
     mode: OutletMode
     inputAmount?: string
+    useMax?: boolean
   }
   [Screens.EarnHome]: { activeEarnTab?: EarnTabType } | undefined
   [Screens.EarnPoolInfoScreen]: { pool: EarnPosition }

From da91f3db92d881f39451ba7fcff089a50d48ec73 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 13:57:52 -0700
Subject: [PATCH 042/118] fix(earn): remove duplicate condition

---
 src/earn/EarnEnterAmount.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index ee118942579..4611950f86f 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -248,7 +248,6 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isLessThanOrEqualTo(0) ||
       tokenAmount.isGreaterThan(balanceInTransactionToken)
     ) {
       return

From f85bed4f0adb145a1ce7d0b3dc3f119d70a17443 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 13:59:33 -0700
Subject: [PATCH 043/118] fix(earn): naming

---
 src/earn/EarnEnterAmount.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 4611950f86f..5bc84ce5f49 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -234,7 +234,7 @@ function EarnEnterAmount({ route }: Props) {
     feeCurrenciesSelector(state, transactionToken.networkId)
   )
 
-  const balanceInTransactionToken = useMemo(
+  const balanceInInputToken = useMemo(
     () =>
       isWithdrawal
         ? transactionToken.balance.multipliedBy(pool.pricePerShare[0])
@@ -248,7 +248,7 @@ function EarnEnterAmount({ route }: Props) {
     if (
       !tokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
-      tokenAmount.isGreaterThan(balanceInTransactionToken)
+      tokenAmount.isGreaterThan(balanceInInputToken)
     ) {
       return
     }
@@ -265,7 +265,7 @@ function EarnEnterAmount({ route }: Props) {
   const { estimatedFeeAmount, feeCurrency, maxFeeAmount } =
     getFeeCurrencyAndAmounts(prepareTransactionsResult)
 
-  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(balanceInTransactionToken)
+  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(balanceInInputToken)
   const showNotEnoughBalanceForGasWarning =
     isAmountLessThanBalance &&
     prepareTransactionsResult &&
@@ -325,7 +325,7 @@ function EarnEnterAmount({ route }: Props) {
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
     if (isWithdrawal) {
-      setTokenAmountInput(balanceInTransactionToken.toFormat({ decimalSeparator }))
+      setTokenAmountInput(balanceInInputToken.toFormat({ decimalSeparator }))
     } else {
       setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
     }
@@ -451,7 +451,7 @@ function EarnEnterAmount({ route }: Props) {
               token={transactionToken}
               prepareTransactionsResult={prepareTransactionsResult}
               feeDetailsBottomSheetRef={feeDetailsBottomSheetRef}
-              balanceInTransactionToken={balanceInTransactionToken}
+              balanceInInputToken={balanceInInputToken}
             />
           )}
         </View>
@@ -572,13 +572,13 @@ function TransactionWithdrawDetails({
   pool,
   prepareTransactionsResult,
   feeDetailsBottomSheetRef,
-  balanceInTransactionToken,
+  balanceInInputToken,
 }: {
   pool: EarnPosition
   token: TokenBalance
   prepareTransactionsResult?: PreparedTransactionsResult
   feeDetailsBottomSheetRef: React.RefObject<BottomSheetModalRefType>
-  balanceInTransactionToken: BigNumber
+  balanceInInputToken: BigNumber
 }) {
   const { t } = useTranslation()
   const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(prepareTransactionsResult)
@@ -594,7 +594,7 @@ function TransactionWithdrawDetails({
           <TokenDisplay
             tokenId={pool.dataProps.depositTokenId}
             testID="EarnEnterAmount/Withdraw/Fiat"
-            amount={balanceInTransactionToken}
+            amount={balanceInInputToken}
             showLocalAmount={true}
             style={styles.txDetailsValueText}
           />
@@ -603,7 +603,7 @@ function TransactionWithdrawDetails({
             <TokenDisplay
               testID="EarnEnterAmount/Withdraw/Crypto"
               tokenId={pool.dataProps.depositTokenId}
-              amount={balanceInTransactionToken}
+              amount={balanceInInputToken}
               showLocalAmount={false}
             />
             {')'}

From c662e3b857b942b7785ae714dda3364f3306c535 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 14:01:14 -0700
Subject: [PATCH 044/118] docs: remove unnecessary comment

---
 src/earn/EarnEnterAmount.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 5bc84ce5f49..5ab4403dfe1 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -623,7 +623,6 @@ function TransactionWithdrawDetails({
             <TokenDisplay
               testID="EarnEnterAmount/Fees"
               tokenId={feeCurrency.tokenId}
-              // TODO: add swap fees to this amount
               amount={maxFeeAmount.toString()}
               style={styles.txDetailsValueText}
             />

From 38853d81b70a5ab27dd2ebcbfe3424bd38f1efcc Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 14:14:17 -0700
Subject: [PATCH 045/118] style(earn): simplify dropdownEnabled

---
 src/earn/EarnEnterAmount.tsx | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 5ab4403dfe1..ff9c5a31322 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -366,16 +366,7 @@ function EarnEnterAmount({ route }: Props) {
     reviewBottomSheetRef.current?.snapToIndex(0)
   }
 
-  const dropdownEnabled = useMemo(() => {
-    switch (mode) {
-      case 'withdraw':
-        return withdrawTokens.length > 1
-      case 'swap-deposit':
-      case 'deposit':
-      default:
-        return availableInputTokens.length > 1
-    }
-  }, [mode, availableInputTokens, withdrawTokens, depositTokens])
+  const dropdownEnabled = availableInputTokens.length > 1
 
   return (
     <SafeAreaView style={styles.safeAreaContainer}>

From b989f051f0d1c71a9527d9689b7f230648ed94f2 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 14:30:50 -0700
Subject: [PATCH 046/118] fix(earn): use decimals from input token

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index ff9c5a31322..a15dff2716f 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -219,7 +219,7 @@ function EarnEnterAmount({ route }: Props) {
         localToToken && localToToken.gt(0)
           ? // no group separator for token amount, round to token.decimals and strip trailing zeros
             localToToken
-              .toFormat(transactionToken.decimals, { decimalSeparator })
+              .toFormat(inputToken.decimals, { decimalSeparator })
               .replace(new RegExp(`[${decimalSeparator}]?0+$`), '')
           : ''
       )

From 2fe5293b9b95b438cd35f1ce048fc3c22473d144 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 14:36:04 -0700
Subject: [PATCH 047/118] style(earn): return single withdrawal and deposit
 token from useTokens hook

---
 src/earn/EarnEnterAmount.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index a15dff2716f..261ce367ba6 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -87,9 +87,9 @@ function useTokens({ pool }: { pool: EarnPosition }) {
   }
 
   return {
-    depositTokens: [depositToken],
-    withdrawTokens: [withdrawToken],
-    eligibleSwappableTokens: eligibleSwappableTokens,
+    depositToken,
+    withdrawToken,
+    eligibleSwappableTokens,
   }
 }
 
@@ -98,13 +98,13 @@ function EarnEnterAmount({ route }: Props) {
 
   const { pool, mode = 'deposit' } = route.params
   const isWithdrawal = mode === 'withdraw'
-  const { depositTokens, withdrawTokens, eligibleSwappableTokens } = useTokens({ pool })
+  const { depositToken, withdrawToken, eligibleSwappableTokens } = useTokens({ pool })
 
   const availableInputTokens = useMemo(() => {
     switch (mode) {
       case 'deposit':
       case 'withdraw':
-        return depositTokens
+        return [depositToken]
       case 'swap-deposit':
         return eligibleSwappableTokens
     }
@@ -112,7 +112,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
   const [transactionToken, setTransactionToken] = useState<TokenBalance>(() =>
-    isWithdrawal ? withdrawTokens[0] : inputToken
+    isWithdrawal ? withdrawToken : inputToken
   )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)

From 4af772d15b12693af80d1b3a0193c532d32bfa78 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 16:21:19 -0700
Subject: [PATCH 048/118] style(earn): PR pair feedback

---
 src/earn/EarnEnterAmount.tsx | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 261ce367ba6..bed87578979 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -111,9 +111,6 @@ function EarnEnterAmount({ route }: Props) {
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
-  const [transactionToken, setTransactionToken] = useState<TokenBalance>(() =>
-    isWithdrawal ? withdrawToken : inputToken
-  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -141,7 +138,6 @@ function EarnEnterAmount({ route }: Props) {
 
   const onSelectToken = (token: TokenBalance) => {
     setInputToken(token)
-    if (!isWithdrawal) setTransactionToken(token)
     tokenBottomSheetRef.current?.close()
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
@@ -228,18 +224,31 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, transactionToken, mode])
+  }, [tokenAmountInput, localAmountInput, enteredIn, mode])
 
-  const feeCurrencies = useSelector((state) =>
-    feeCurrenciesSelector(state, transactionToken.networkId)
-  )
+  // This is for withdrawals as we want the user to be able to input the amounts in the deposit token
+  const { transactionToken, transactionTokenAmount } = useMemo(() => {
+    const transactionToken = isWithdrawal ? withdrawToken : inputToken
+    const transactionTokenAmount = isWithdrawal
+      ? tokenAmount && tokenAmount.dividedBy(pool.pricePerShare[0])
+      : tokenAmount
+
+    return {
+      transactionToken,
+      transactionTokenAmount,
+    }
+  }, [inputToken, withdrawToken, tokenAmount, isWithdrawal, pool])
 
   const balanceInInputToken = useMemo(
     () =>
       isWithdrawal
         ? transactionToken.balance.multipliedBy(pool.pricePerShare[0])
         : transactionToken.balance,
-    [transactionToken, pool, mode]
+    [transactionToken, isWithdrawal, pool]
+  )
+
+  const feeCurrencies = useSelector((state) =>
+    feeCurrenciesSelector(state, transactionToken.networkId)
   )
 
   useEffect(() => {
@@ -247,6 +256,7 @@ function EarnEnterAmount({ route }: Props) {
 
     if (
       !tokenAmount ||
+      !transactionTokenAmount ||
       tokenAmount.isLessThanOrEqualTo(0) ||
       tokenAmount.isGreaterThan(balanceInInputToken)
     ) {
@@ -254,7 +264,7 @@ function EarnEnterAmount({ route }: Props) {
     }
     const debouncedRefreshTransactions = setTimeout(() => {
       return handleRefreshPreparedTransactions(
-        isWithdrawal ? tokenAmount.multipliedBy(pool.pricePerShare[0]) : tokenAmount,
+        transactionTokenAmount,
         transactionToken,
         feeCurrencies
       )
@@ -324,11 +334,7 @@ function EarnEnterAmount({ route }: Props) {
     // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
-    if (isWithdrawal) {
-      setTokenAmountInput(balanceInInputToken.toFormat({ decimalSeparator }))
-    } else {
-      setTokenAmountInput(inputToken.balance.toFormat({ decimalSeparator }))
-    }
+    setTokenAmountInput(balanceInInputToken.toFormat({ decimalSeparator }))
     setEnteredIn('token')
     setMaxPressed(true)
     tokenAmountInputRef.current?.blur()

From 775a925e513c69734d544cc45531d208676d2a33 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 16:31:42 -0700
Subject: [PATCH 049/118] fix(earn): display correct amounts on input amount
 token toggle

---
 src/earn/EarnEnterAmount.tsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index bed87578979..6a2ce1e9eb3 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -111,6 +111,9 @@ function EarnEnterAmount({ route }: Props) {
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
+  const [transactionToken, setTransactionToken] = useState<TokenBalance>(() =>
+    isWithdrawal ? withdrawToken : inputToken
+  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -138,6 +141,7 @@ function EarnEnterAmount({ route }: Props) {
 
   const onSelectToken = (token: TokenBalance) => {
     setInputToken(token)
+    if (!isWithdrawal) setTransactionToken(token)
     tokenBottomSheetRef.current?.close()
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
@@ -224,20 +228,15 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, mode])
+  }, [tokenAmountInput, localAmountInput, enteredIn, mode, transactionToken])
 
   // This is for withdrawals as we want the user to be able to input the amounts in the deposit token
-  const { transactionToken, transactionTokenAmount } = useMemo(() => {
-    const transactionToken = isWithdrawal ? withdrawToken : inputToken
-    const transactionTokenAmount = isWithdrawal
-      ? tokenAmount && tokenAmount.dividedBy(pool.pricePerShare[0])
-      : tokenAmount
+  const transactionTokenAmount = useMemo(
+    () =>
+      isWithdrawal ? tokenAmount && tokenAmount.dividedBy(pool.pricePerShare[0]) : tokenAmount,
 
-    return {
-      transactionToken,
-      transactionTokenAmount,
-    }
-  }, [inputToken, withdrawToken, tokenAmount, isWithdrawal, pool])
+    [transactionToken, inputToken, withdrawToken, tokenAmount, isWithdrawal, pool]
+  )
 
   const balanceInInputToken = useMemo(
     () =>

From 176cb9defffcee233c45d8ba4a66daf919131dd6 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 16:59:15 -0700
Subject: [PATCH 050/118] Revert "fix(earn): display correct amounts on input
 amount token toggle"

This reverts commit 775a925e513c69734d544cc45531d208676d2a33.
---
 src/earn/EarnEnterAmount.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 6a2ce1e9eb3..bed87578979 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -111,9 +111,6 @@ function EarnEnterAmount({ route }: Props) {
   }, [mode])
 
   const [inputToken, setInputToken] = useState<TokenBalance>(() => availableInputTokens[0])
-  const [transactionToken, setTransactionToken] = useState<TokenBalance>(() =>
-    isWithdrawal ? withdrawToken : inputToken
-  )
 
   const reviewBottomSheetRef = useRef<BottomSheetModalRefType>(null)
   const feeDetailsBottomSheetRef = useRef<BottomSheetModalRefType>(null)
@@ -141,7 +138,6 @@ function EarnEnterAmount({ route }: Props) {
 
   const onSelectToken = (token: TokenBalance) => {
     setInputToken(token)
-    if (!isWithdrawal) setTransactionToken(token)
     tokenBottomSheetRef.current?.close()
     // NOTE: analytics is already fired by the bottom sheet, don't need one here
   }
@@ -228,15 +224,20 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, mode, transactionToken])
+  }, [tokenAmountInput, localAmountInput, enteredIn, mode])
 
   // This is for withdrawals as we want the user to be able to input the amounts in the deposit token
-  const transactionTokenAmount = useMemo(
-    () =>
-      isWithdrawal ? tokenAmount && tokenAmount.dividedBy(pool.pricePerShare[0]) : tokenAmount,
+  const { transactionToken, transactionTokenAmount } = useMemo(() => {
+    const transactionToken = isWithdrawal ? withdrawToken : inputToken
+    const transactionTokenAmount = isWithdrawal
+      ? tokenAmount && tokenAmount.dividedBy(pool.pricePerShare[0])
+      : tokenAmount
 
-    [transactionToken, inputToken, withdrawToken, tokenAmount, isWithdrawal, pool]
-  )
+    return {
+      transactionToken,
+      transactionTokenAmount,
+    }
+  }, [inputToken, withdrawToken, tokenAmount, isWithdrawal, pool])
 
   const balanceInInputToken = useMemo(
     () =>

From 2d874785054feb252ab6f169295266ea6ae5abcf Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 17:00:32 -0700
Subject: [PATCH 051/118] fix(earn): add inputToken to dependency array

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index bed87578979..f9d5ef891e6 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -224,7 +224,7 @@ function EarnEnterAmount({ route }: Props) {
         localAmount: parsedLocalAmount,
       }
     }
-  }, [tokenAmountInput, localAmountInput, enteredIn, mode])
+  }, [tokenAmountInput, localAmountInput, enteredIn, inputToken])
 
   // This is for withdrawals as we want the user to be able to input the amounts in the deposit token
   const { transactionToken, transactionTokenAmount } = useMemo(() => {

From 8ccfbfc935d8251dd2199f8a45abb679041b86ec Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 17:14:58 -0700
Subject: [PATCH 052/118] chore(earn): update analytics for withdrawals

---
 src/analytics/Properties.tsx      | 11 +++++++++--
 src/earn/EarnEnterAmount.test.tsx |  3 +--
 src/earn/EarnEnterAmount.tsx      | 15 ++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 7d5514d9d14..2c63dbf6f9f 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1554,7 +1554,7 @@ export interface EarnCommonProperties {
 
 interface EarnDepositProperties extends EarnCommonProperties {
   depositTokenAmount: string
-  mode: EarnEnterMode
+  mode: 'deposit' | 'swap-deposit'
   // the below are mainly for swap-deposit. For deposit, this would just be
   // same as the depositTokenAmount and depositTokenId
   fromTokenAmount: string
@@ -1599,7 +1599,14 @@ interface EarnEventsProperties {
   [EarnEvents.earn_enter_amount_continue_press]: {
     amountInUsd: string
     amountEnteredIn: AmountEnteredIn
-  } & EarnDepositProperties
+    mode: EarnEnterMode
+    // For deposits these will be the same as the depositTokenId and depositTokenAmount
+    // For swaps these will be the swapFromTokenId and swapFromTokenAmount
+    // For withdrawals this will be in units of the depositToken
+    fromTokenAmount: string
+    fromTokenId: string
+    depositTokenAmount?: string
+  } & EarnCommonProperties
   [EarnEvents.earn_deposit_add_gas_press]: EarnCommonProperties & { gasTokenId: string }
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward' | 'EarnSwapDeposit'
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 2f3974030e7..a17ea989b8b 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -442,9 +442,8 @@ describe('EarnEnterAmount', () => {
         depositTokenId: mockArbUsdcTokenId,
         providerId: mockEarnPositions[0].appId,
         poolId: mockEarnPositions[0].positionId,
-        fromTokenId: 'arbitrum-sepolia:0x460b97bd498e1157530aeb3086301d5225b91216',
+        fromTokenId: 'arbitrum-sepolia:0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
         fromTokenAmount: '8',
-        depositTokenAmount: '8',
         mode: 'withdraw',
       })
 
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index f9d5ef891e6..47d2e05e971 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -353,20 +353,21 @@ function EarnEnterAmount({ route }: Props) {
       return
     }
     AppAnalytics.track(EarnEvents.earn_enter_amount_continue_press, {
-      amountInUsd: isWithdrawal
-        ? tokenAmount.multipliedBy(inputToken.priceUsd ?? 0).toFixed(2)
-        : tokenAmount.multipliedBy(transactionToken.priceUsd ?? 0).toFixed(2),
+      // TokenAmount is always deposit token
+      amountInUsd: tokenAmount.multipliedBy(inputToken.priceUsd ?? 0).toFixed(2),
       amountEnteredIn: enteredIn,
       depositTokenId: pool.dataProps.depositTokenId,
       networkId: transactionToken.networkId,
       providerId: pool.appId,
       poolId: pool.positionId,
-      fromTokenId: transactionToken.tokenId,
+      fromTokenId: inputToken.tokenId,
       fromTokenAmount: tokenAmount.toString(),
       mode,
-      depositTokenAmount: swapTransaction
-        ? getSwapToAmountInDecimals({ swapTransaction, fromAmount: tokenAmount }).toString()
-        : tokenAmount.toString(),
+      depositTokenAmount: isWithdrawal
+        ? undefined
+        : swapTransaction
+          ? getSwapToAmountInDecimals({ swapTransaction, fromAmount: tokenAmount }).toString()
+          : tokenAmount.toString(),
     })
     // TODO(ACT-1389) if isWithdrawal === true navigate to EarnConfirmationScreen
     reviewBottomSheetRef.current?.snapToIndex(0)

From 6924060c3ea36ceba95de53f2cd7962cb1630158 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 19:05:05 -0700
Subject: [PATCH 053/118] fix: analytics build errors

---
 src/analytics/Properties.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 2c63dbf6f9f..0c91f2a539d 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1554,7 +1554,7 @@ export interface EarnCommonProperties {
 
 interface EarnDepositProperties extends EarnCommonProperties {
   depositTokenAmount: string
-  mode: 'deposit' | 'swap-deposit'
+  mode: EarnEnterMode
   // the below are mainly for swap-deposit. For deposit, this would just be
   // same as the depositTokenAmount and depositTokenId
   fromTokenAmount: string

From 30c6ea9e27cdcd41dbd3b52096b53a9baa0ac18a Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 19:31:10 -0700
Subject: [PATCH 054/118] test(earn): withdrawals from pools with high price
 per share

---
 src/earn/EarnEnterAmount.test.tsx | 39 +++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index a17ea989b8b..52c3c0e305a 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -138,6 +138,12 @@ const params = {
   pool: mockEarnPositions[0],
 }
 
+const mockPoolWithHighPricePerShare = {
+  ...mockEarnPositions[0],
+  pricePerShare: '2',
+  balance: '10',
+}
+
 describe('EarnEnterAmount', () => {
   const refreshPreparedTransactionsSpy = jest.fn()
   beforeEach(() => {
@@ -382,7 +388,6 @@ describe('EarnEnterAmount', () => {
   })
 
   describe('withdraw', () => {
-    // Pool balance should be set to determine available withdrawal amount
     const withdrawParams = { ...params, mode: 'withdraw' }
 
     beforeEach(() => {
@@ -398,7 +403,7 @@ describe('EarnEnterAmount', () => {
         isPreparingTransactions: false,
       })
     })
-    it('should show only the deposit token and not include the token dropdown', async () => {
+    it('should show the deposit token and a disabled token dropdown', async () => {
       const { getByTestId, queryByTestId } = render(
         <Provider store={store}>
           <MockedNavigator component={EarnEnterAmount} params={withdrawParams} />
@@ -449,6 +454,36 @@ describe('EarnEnterAmount', () => {
 
       //TODO(ACT-1389): check navigation to withdrawal confirmation screen
     })
+
+    it('should allow the user to set an input value over the pool balance if pricePerShare is great than 1', async () => {
+      const { getByTestId, queryByTestId } = render(
+        <Provider store={store}>
+          <MockedNavigator
+            component={EarnEnterAmount}
+            params={{ pool: mockPoolWithHighPricePerShare, mode: 'withdraw' }}
+          />
+        </Provider>
+      )
+
+      fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '15')
+      expect(queryByTestId('EarnEnterAmount/NotEnoughBalanceWarning')).toBeFalsy()
+      expect(getByTestId('EarnEnterAmount/Continue')).toBeEnabled()
+    })
+
+    it('should not allow the user to set an input amount higher than pool balance * pricePerShare', async () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <MockedNavigator
+            component={EarnEnterAmount}
+            params={{ pool: mockPoolWithHighPricePerShare, mode: 'withdraw' }}
+          />
+        </Provider>
+      )
+
+      fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '20.001')
+      expect(getByTestId('EarnEnterAmount/NotEnoughBalanceWarning')).toBeTruthy()
+      expect(getByTestId('EarnEnterAmount/Continue')).toBeDisabled()
+    })
   })
 
   // tests independent of deposit / swap-deposit

From bebc38a28b3414f8d5be1238259630d13745fed4 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 16 Oct 2024 23:09:59 -0700
Subject: [PATCH 055/118] feat(earn-confirmation): set title based on outlet
 mode

---
 src/earn/EarnConfirmationScreen.test.tsx | 40 ++++++++++++++++++------
 src/earn/EarnConfirmationScreen.tsx      | 32 +++++++------------
 src/earn/types.ts                        |  2 +-
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 7801f3a04fb..d07e4c4c987 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -117,13 +117,13 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
       '11.83 USDC'
@@ -154,13 +154,13 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
@@ -184,13 +184,13 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
@@ -209,7 +209,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -259,7 +259,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -287,7 +287,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -327,11 +327,31 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'collect',
+            mode: 'withdraw',
           }}
         />
       </Provider>
     )
     expect(getByTestId('EarnConfirmation/GasSubsidized')).toBeTruthy()
   })
+
+  it.each([
+    ['claim', 'earnFlow.collect.titleClaim'],
+    ['withdraw', 'earnFlow.collect.titleWithdraw'],
+    ['exit', 'earnFlow.collect.titleCollect'],
+  ])('shows correct header text for %s', async (mode, expectedHeader) => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnConfirmationScreen}
+          params={{
+            pool: mockEarnPositions[0],
+            mode: mode,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText(expectedHeader)).toBeTruthy()
+  })
 })
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 2ec28c6495d..449e9418254 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -20,7 +20,7 @@ import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { hooksApiUrlSelector, positionsWithBalanceSelector } from 'src/positions/selectors'
-import { EarnPosition, Token } from 'src/positions/types'
+import { Token } from 'src/positions/types'
 import { useDispatch, useSelector } from 'src/redux/hooks'
 import { NETWORK_NAMES } from 'src/shared/conts'
 import Colors from 'src/styles/colors'
@@ -146,7 +146,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
   return (
     <SafeAreaView style={styles.container}>
       <ScrollView contentContainerStyle={styles.contentContainer}>
-        <Title pool={pool} mode={mode} />
+        <Title mode={mode} />
         <View style={styles.collectInfoContainer}>
           <CollectItem
             title={t('earnFlow.collect.total')}
@@ -319,25 +319,17 @@ function GasFee({
   )
 }
 
-// TODO: add fallback title for when claimType is not earnings or rewards
-function Title({ pool, mode }: { pool: EarnPosition; mode: OutletMode }) {
+function Title({ mode }: { mode: OutletMode }) {
   const { t } = useTranslation()
-  return (
-    <>
-      {mode === 'withdraw' ? (
-        <Text style={styles.title}>{t('earnFlow.collect.titleWithdraw')}</Text>
-      ) : (
-        <>
-          {pool.dataProps.claimType === 'earnings' && (
-            <Text style={styles.title}>{t('earnFlow.collect.titleClaim')}</Text>
-          )}
-          {pool.dataProps.claimType === 'rewards' && (
-            <Text style={styles.title}>{t('earnFlow.collect.titleCollect')}</Text>
-          )}
-        </>
-      )}
-    </>
-  )
+  switch (mode) {
+    case 'claim':
+      return <Text style={styles.title}>{t('earnFlow.collect.titleClaim')}</Text>
+    case 'withdraw':
+      return <Text style={styles.title}>{t('earnFlow.collect.titleWithdraw')}</Text>
+    case 'exit':
+    default:
+      return <Text style={styles.title}>{t('earnFlow.collect.titleCollect')}</Text>
+  }
 }
 
 const styles = StyleSheet.create({
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 189fcf9366e..91f7a61a727 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -69,4 +69,4 @@ export interface BeforeDepositAction {
 
 export type EarnEnterMode = 'deposit' | 'swap-deposit' | 'withdraw'
 
-export type OutletMode = 'withdraw' | 'collect' | 'exit'
+export type OutletMode = 'withdraw' | 'claim' | 'exit'

From 4af9d07d1b9ef607eadd5bd62129a03c966d6bb8 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 18 Oct 2024 17:16:50 -0700
Subject: [PATCH 056/118] test(earn-confirmation): remove apy references

---
 src/earn/EarnConfirmationScreen.test.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 52bea0d763c..c3179705640 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -103,7 +103,7 @@ describe('EarnConfirmationScreen', () => {
     store.clearActions()
   })
 
-  it('renders total balance, rewards, apy and gas after fetching rewards and preparing tx', async () => {
+  it('renders total balance, rewards and gas after fetching rewards and preparing tx', async () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -124,7 +124,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
       '₱15.73'
     )
-    expect(queryByTestId('EarnConfirmation/ApyLoading')).toBeFalsy()
     expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 

From 33fe6857b43f3c2d12a4b12c3a64fae53294f943 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 18 Oct 2024 17:57:40 -0700
Subject: [PATCH 057/118] style(earn-confirmation): use balance util function

---
 src/earn/EarnConfirmationScreen.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 7e8d7be8843..62d64be3ba8 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -14,7 +14,7 @@ import { usePrepareWithdrawAndClaimTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { OutletMode } from 'src/earn/types'
-import { isGasSubsidizedForNetwork } from 'src/earn/utils'
+import { getEarnPositionBalanceValues, isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -73,7 +73,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     if (inputAmount) {
       return new BigNumber(inputAmount).multipliedBy(pool.pricePerShare[0] ?? 1)
     } else {
-      return withdrawToken.balance.multipliedBy(pool.pricePerShare[0] ?? 1)
+      return getEarnPositionBalanceValues({ pool }).poolBalanceInDepositToken
     }
   }, [withdrawToken, pool.pricePerShare, inputAmount])
 
@@ -91,12 +91,6 @@ export default function EarnConfirmationScreen({ route }: Props) {
     useMax,
   })
 
-  // TODO(tomm): use hook and use in Screen
-  // const { withdrawAmountInDepositToken,  } = useMemo(
-  //   () => getEarnPositionBalanceValues({ pool }),
-  //   [pool]
-  // )
-
   const onPress = () => {
     if (prepareTransactionsResult?.type !== 'possible') {
       // should never happen because button is disabled if withdraw is not possible

From ded3ddbd2a4836e402801d3934b830ae1b68844a Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 22 Oct 2024 17:10:45 -0700
Subject: [PATCH 058/118] fix(earn): omit claim action when withdrawal includes
 claim

---
 src/earn/poolInfoScreen/WithdrawBottomSheet.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
index 0317a0b571d..2366a0e86ad 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
@@ -150,7 +150,9 @@ export default function WithdrawBottomSheet({
     >
       <View style={styles.actionsContainer}>
         <PartialWithdrawAction forwardedRef={forwardedRef} pool={pool} hasRewards={canClaim} />
-        {canClaim && <ClaimAction forwardedRef={forwardedRef} pool={pool} />}
+        {canClaim && !pool.dataProps.withdrawalIncludesClaim && (
+          <ClaimAction forwardedRef={forwardedRef} pool={pool} />
+        )}
         <ExitAction forwardedRef={forwardedRef} pool={pool} hasRewards={canClaim} />
       </View>
     </BottomSheet>

From 21924080144d74cb3c1280b7f2867f53b892973c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 22 Oct 2024 19:02:12 -0700
Subject: [PATCH 059/118] docs(earn): remove todo

---
 src/earn/poolInfoScreen/WithdrawBottomSheet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
index 2366a0e86ad..0d190db645d 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
@@ -85,7 +85,7 @@ function ClaimAction({
         networkId: pool.networkId,
         depositTokenId: pool.dataProps.depositTokenId,
       })
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: action.name }) // TODO (ACT-1389): Confirmation screen for Claim
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: action.name })
       forwardedRef.current?.close()
     },
   }

From 390e9c53231f59049165314b394dffc141af04e4 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 23 Oct 2024 11:39:02 -0700
Subject: [PATCH 060/118] style: pass inputAmount in deposit token

---
 src/earn/EarnConfirmationScreen.tsx | 11 ++++-------
 src/earn/EarnEnterAmount.test.tsx   |  7 ++++++-
 src/earn/EarnEnterAmount.tsx        |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index c932f23a850..974dd25d357 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -69,13 +69,10 @@ export default function EarnConfirmationScreen({ route }: Props) {
 
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
 
-  const withdrawAmountInDepositToken = useMemo(() => {
-    if (inputAmount) {
-      return new BigNumber(inputAmount).multipliedBy(pool.pricePerShare[0] ?? 1)
-    } else {
-      return getEarnPositionBalanceValues({ pool }).poolBalanceInDepositToken
-    }
-  }, [withdrawToken, pool.pricePerShare, inputAmount])
+  const withdrawAmountInDepositToken = useMemo(
+    () => inputAmount ?? getEarnPositionBalanceValues({ pool }).poolBalanceInDepositToken,
+    [withdrawToken, pool.pricePerShare, inputAmount]
+  )
 
   const {
     result: prepareTransactionsResult,
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index eb9b8ca057f..70fbedbc181 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -489,7 +489,12 @@ describe('EarnEnterAmount', () => {
         mode: 'withdraw',
       })
 
-      //TODO(ACT-1389): check navigation to withdrawal confirmation screen
+      expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
+        pool: mockEarnPositions[0],
+        mode: 'PartialWithdraw',
+        inputAmount: '8',
+        useMax: false,
+      })
     })
 
     it('should allow the user to set an input value over the pool balance if pricePerShare is greater than 1', async () => {
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index caea6ae242d..f03a3e7e345 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -384,7 +384,7 @@ function EarnEnterAmount({ route }: Props) {
       navigate(Screens.EarnConfirmationScreen, {
         pool,
         mode: 'PartialWithdraw',
-        inputAmount: tokenAmount.dividedBy(pool.pricePerShare[0] ?? 0).toString(),
+        inputAmount: tokenAmount.toString(),
         useMax: maxPressed,
       })
     } else {

From d1bf9eeb7e7d9f3fc326917330227a1c9fcb5e7d Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 23 Oct 2024 11:50:43 -0700
Subject: [PATCH 061/118] test(earn): navigation to confirmation screen

---
 .../poolInfoScreen/WithdrawBottomSheet.test.tsx  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
index f9db66951c2..90a312ab0d4 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
@@ -98,7 +98,13 @@ describe('WithdrawBottomSheet', () => {
       networkId: mockEarnPositions[0].networkId,
       depositTokenId: mockEarnPositions[0].dataProps.depositTokenId,
     })
-    // TODO (ACT-1389): Check that navigate called with confirmation screen for Claim
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
+      pool: {
+        ...mockEarnPositions[0],
+        balance: '100',
+      },
+      mode: 'Claim',
+    })
   })
   it('tapping exit on WithdrawBottomSheet navigates to enter amount screen', () => {
     jest
@@ -122,7 +128,13 @@ describe('WithdrawBottomSheet', () => {
       networkId: mockEarnPositions[0].networkId,
       depositTokenId: mockEarnPositions[0].dataProps.depositTokenId,
     })
-    // TODO (ACT-1389): Check that navigate called with confirmation screen for Claim
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
+      pool: {
+        ...mockEarnPositions[0],
+        balance: '100',
+      },
+      mode: 'Exit',
+    })
   })
   it('shows correct copy when ClaimType is Earnings', () => {
     jest

From d2fd3986fa0e5a7f01a476499a8e7e479db459af Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 23 Oct 2024 12:16:31 -0700
Subject: [PATCH 062/118] fix(earn-withdrawal): use amount in lp token for
 withdrawal transaction

---
 src/earn/EarnConfirmationScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 974dd25d357..adcc0ec4bb9 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -79,7 +79,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     loading: isPreparingTransactions,
     error: prepareTransactionError,
   } = usePrepareWithdrawAndClaimTransactions({
-    amount: withdrawAmountInDepositToken.toString(),
+    amount: new BigNumber(withdrawAmountInDepositToken).dividedBy(pool.pricePerShare[0]).toString(),
     pool,
     walletAddress,
     feeCurrencies,

From 5f2360d4edffd67e7fcf0e4b408f1bf416167edd Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 23 Oct 2024 13:03:16 -0700
Subject: [PATCH 063/118] test(earn): update expected amount to use deposit
 token

---
 src/earn/EarnConfirmationScreen.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index f335c5ad9c1..61fee38b28d 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -148,7 +148,7 @@ describe('EarnConfirmationScreen', () => {
       rewardsPositions: [mockRewardsPositions[1]],
       walletAddress: mockAccount.toLowerCase(),
       hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
-      amount: '11.825',
+      amount: '10.75',
     })
     expect(store.getActions()).toEqual([])
   })

From 01ec110263c01a9934a79060a2659d3df89cfb64 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 23 Oct 2024 13:23:28 -0700
Subject: [PATCH 064/118] fix(earn): revert hiding claim option when
 withdrawalIncludesClaim

---
 src/earn/poolInfoScreen/WithdrawBottomSheet.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
index 0d190db645d..f58bc5171c7 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
@@ -150,9 +150,7 @@ export default function WithdrawBottomSheet({
     >
       <View style={styles.actionsContainer}>
         <PartialWithdrawAction forwardedRef={forwardedRef} pool={pool} hasRewards={canClaim} />
-        {canClaim && !pool.dataProps.withdrawalIncludesClaim && (
-          <ClaimAction forwardedRef={forwardedRef} pool={pool} />
-        )}
+        {canClaim && <ClaimAction forwardedRef={forwardedRef} pool={pool} />}
         <ExitAction forwardedRef={forwardedRef} pool={pool} hasRewards={canClaim} />
       </View>
     </BottomSheet>

From 1f75a5918045476b9049795c872a4c5f2b4d5350 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 24 Oct 2024 13:55:33 -0700
Subject: [PATCH 065/118] refactor(earn-types): combine withdraw actions and
 earn enter mode

---
 src/analytics/Properties.tsx                  | 15 +++++--------
 src/analytics/types.ts                        |  1 +
 src/earn/EarnConfirmationScreen.test.tsx      | 22 +++++++++----------
 src/earn/EarnConfirmationScreen.tsx           | 15 +++++++------
 src/earn/EarnDepositBottomSheet.test.tsx      |  5 +++--
 src/earn/EarnDepositBottomSheet.tsx           |  4 ++--
 src/earn/EarnEnterAmount.test.tsx             |  2 +-
 src/earn/EarnEnterAmount.tsx                  |  6 +++--
 .../EarnPoolInfoScreen.test.tsx               |  8 +++----
 .../poolInfoScreen/EarnPoolInfoScreen.tsx     |  2 +-
 .../WithdrawBottomSheet.test.tsx              | 22 +++++++++----------
 .../poolInfoScreen/WithdrawBottomSheet.tsx    | 16 +++++++-------
 src/earn/prepareTransactions.ts               |  8 +++----
 src/earn/types.ts                             |  8 +++----
 src/navigator/types.tsx                       |  6 ++---
 15 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 9cbeb42b48e..1b5a731455a 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -54,12 +54,7 @@ import { ErrorMessages } from 'src/app/ErrorMessages'
 import { AddAssetsActionType } from 'src/components/AddAssetsBottomSheet'
 import { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { DappSection } from 'src/dapps/types'
-import {
-  BeforeDepositActionName,
-  EarnEnterMode,
-  SerializableRewardsInfo,
-  WithdrawActionName,
-} from 'src/earn/types'
+import { BeforeDepositActionName, EarnActiveAction, SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
@@ -595,7 +590,7 @@ interface SendEventsProperties {
     tokenId: string
     tokenAddress: string | null
     networkId: NetworkId | null
-    mode?: EarnEnterMode
+    mode?: EarnActiveAction
   }
   [SendEvents.swap_input_pressed]: {
     swapToLocalAmount: boolean
@@ -1559,7 +1554,7 @@ export interface EarnCommonProperties {
 
 interface EarnDepositProperties extends EarnCommonProperties {
   depositTokenAmount: string
-  mode: EarnEnterMode
+  mode: EarnActiveAction
   // the below are mainly for swap-deposit. For deposit, this would just be
   // same as the depositTokenAmount and depositTokenId
   fromTokenAmount: string
@@ -1604,7 +1599,7 @@ interface EarnEventsProperties {
   [EarnEvents.earn_enter_amount_continue_press]: {
     amountInUsd: string
     amountEnteredIn: AmountEnteredIn
-    mode: EarnEnterMode
+    mode: EarnActiveAction
     // For deposits these will be the same as the depositTokenId and depositTokenAmount
     // For swaps these will be the swapFromTokenId and swapFromTokenAmount
     // For withdrawals this will be in units of the depositToken
@@ -1647,7 +1642,7 @@ interface EarnEventsProperties {
   [EarnEvents.earn_pool_info_tap_safety_details]: EarnCommonProperties & {
     action: 'expand' | 'collapse'
   }
-  [EarnEvents.earn_select_withdraw_type]: EarnCommonProperties & { type: WithdrawActionName }
+  [EarnEvents.earn_select_withdraw_type]: EarnCommonProperties & { type: EarnActiveAction }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/types.ts b/src/analytics/types.ts
index db7481da351..36ccbb5011f 100644
--- a/src/analytics/types.ts
+++ b/src/analytics/types.ts
@@ -38,6 +38,7 @@ export type TransactionOrigin =
   | 'earn-deposit'
   | 'earn-swap-deposit'
   | 'earn-withdraw'
+  | 'earn-claim-rewards'
   | 'jumpstart-send'
   | 'jumpstart-claim'
   | 'wallet-connect'
diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 61fee38b28d..ee1d64379d7 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -110,7 +110,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -171,7 +171,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -208,7 +208,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -238,7 +238,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -263,7 +263,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -313,7 +313,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -341,7 +341,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -381,7 +381,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: mockEarnPositions[0],
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
           }}
         />
       </Provider>
@@ -390,9 +390,9 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it.each([
-    ['Claim', 'earnFlow.collect.titleClaim'],
-    ['PartialWithdraw', 'earnFlow.collect.titleWithdraw'],
-    ['Exit', 'earnFlow.collect.titleCollect'],
+    ['claim-rewards', 'earnFlow.collect.titleClaim'],
+    ['withdraw', 'earnFlow.collect.titleWithdraw'],
+    ['exit', 'earnFlow.collect.titleCollect'],
   ])('shows correct header text for %s', async (mode, expectedHeader) => {
     const { getByText } = render(
       <Provider store={store}>
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index adcc0ec4bb9..21a9d159f47 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -13,7 +13,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { usePrepareWithdrawAndClaimTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
-import { WithdrawActionName } from 'src/earn/types'
+import { EarnActiveAction } from 'src/earn/types'
 import { getEarnPositionBalanceValues, isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
@@ -74,6 +74,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     [withdrawToken, pool.pricePerShare, inputAmount]
   )
 
+  // Will need this to handle preparing a claim transaction, a withdrawal transaction and a withdrawal and claim transaction
   const {
     result: prepareTransactionsResult,
     loading: isPreparingTransactions,
@@ -211,9 +212,9 @@ export default function EarnConfirmationScreen({ route }: Props) {
         style={styles.button}
         size={BtnSizes.FULL}
         text={
-          mode === 'PartialWithdraw'
+          mode === 'withdraw'
             ? t('earnFlow.collect.ctaWithdraw')
-            : mode === 'Exit'
+            : mode === 'exit'
               ? t('earnFlow.collect.ctaExit')
               : t('earnFlow.collect.ctaReward')
         }
@@ -316,14 +317,14 @@ function GasFee({
   )
 }
 
-function Title({ mode }: { mode: WithdrawActionName }) {
+function Title({ mode }: { mode: EarnActiveAction }) {
   const { t } = useTranslation()
   switch (mode) {
-    case 'Claim':
+    case 'claim-rewards':
       return <Text style={styles.title}>{t('earnFlow.collect.titleClaim')}</Text>
-    case 'PartialWithdraw':
+    case 'withdraw':
       return <Text style={styles.title}>{t('earnFlow.collect.titleWithdraw')}</Text>
-    case 'Exit':
+    case 'exit':
     default:
       return <Text style={styles.title}>{t('earnFlow.collect.titleCollect')}</Text>
   }
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index e1397ec33e6..fd1084dcddf 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -7,6 +7,7 @@ import { EarnEvents } from 'src/analytics/Events'
 import { openUrl } from 'src/app/actions'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { depositStart } from 'src/earn/slice'
+import { EarnActiveAction } from 'src/earn/types'
 import * as earnUtils from 'src/earn/utils'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
@@ -57,13 +58,13 @@ const mockDepositProps = {
   inputAmount: new BigNumber(100),
   preparedTransaction: mockPreparedTransaction,
   pool: mockEarnPositions[0],
-  mode: 'deposit' as const,
+  mode: 'deposit' as EarnActiveAction,
   inputTokenId: mockArbUsdcTokenId,
 }
 
 const mockSwapDepositProps = {
   ...mockDepositProps,
-  mode: 'swap-deposit' as const,
+  mode: 'swap-deposit' as EarnActiveAction,
   inputTokenId: mockArbEthTokenId,
   inputAmount: new BigNumber(0.041),
   swapTransaction: {
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index d9f6a097bbc..30bf4d1b098 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -11,7 +11,7 @@ import { LabelWithInfo } from 'src/components/LabelWithInfo'
 import TokenDisplay from 'src/components/TokenDisplay'
 import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
-import { EarnEnterMode } from 'src/earn/types'
+import { EarnActiveAction } from 'src/earn/types'
 import {
   getSwapToAmountInDecimals,
   getTotalYieldRate,
@@ -50,7 +50,7 @@ export default function EarnDepositBottomSheet({
   inputTokenId: string
   inputAmount: BigNumber
   pool: EarnPosition
-  mode: EarnEnterMode
+  mode: EarnActiveAction
   swapTransaction?: SwapTransaction
 }) {
   const { t } = useTranslation()
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 70fbedbc181..f9b22a81fe5 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -491,7 +491,7 @@ describe('EarnEnterAmount', () => {
 
       expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
         pool: mockEarnPositions[0],
-        mode: 'PartialWithdraw',
+        mode: 'withdraw',
         inputAmount: '8',
         useMax: false,
       })
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index f03a3e7e345..824a60051e7 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -106,6 +106,7 @@ function EarnEnterAmount({ route }: Props) {
       case 'withdraw':
         return [depositToken]
       case 'swap-deposit':
+      default:
         return eligibleSwappableTokens
     }
   }, [mode])
@@ -169,7 +170,8 @@ function EarnEnterAmount({ route }: Props) {
       feeCurrencies,
       pool,
       hooksApiUrl,
-      shortcutId: mode,
+      // Mode is the same and shortcutId, except for exit which is withdraw
+      shortcutId: mode === 'exit' ? 'withdraw' : mode,
       useMax: maxPressed,
     })
   }
@@ -383,7 +385,7 @@ function EarnEnterAmount({ route }: Props) {
     if (isWithdrawal) {
       navigate(Screens.EarnConfirmationScreen, {
         pool,
-        mode: 'PartialWithdraw',
+        mode,
         inputAmount: tokenAmount.toString(),
         useMax: maxPressed,
       })
diff --git a/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx b/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
index 45421ca332e..2b2a77ef0f5 100644
--- a/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
+++ b/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
@@ -668,7 +668,7 @@ describe('EarnPoolInfoScreen', () => {
     })
     expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
       pool: { ...mockEarnPositions[0], balance: '100' },
-      mode: 'Exit',
+      mode: 'exit',
     })
   })
   it('open WithdrawBottomSheet when Withdraw button pressed, check that expected options exist', () => {
@@ -694,9 +694,9 @@ describe('EarnPoolInfoScreen', () => {
     )
     fireEvent.press(getByTestId('WithdrawButton'))
     expect(getByTestId('Earn/WithdrawBottomSheet')).toBeVisible()
-    expect(getByTestId('Earn/ActionCard/PartialWithdraw')).toBeTruthy()
-    expect(getByTestId('Earn/ActionCard/Claim')).toBeTruthy()
-    expect(getByTestId('Earn/ActionCard/Exit')).toBeTruthy()
+    expect(getByTestId('Earn/ActionCard/withdraw')).toBeTruthy()
+    expect(getByTestId('Earn/ActionCard/claim-rewards')).toBeTruthy()
+    expect(getByTestId('Earn/ActionCard/exit')).toBeTruthy()
   })
 
   it('shows the daily yield rate when it is available', () => {
diff --git a/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx b/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
index c02f299d0e7..77addd562a9 100644
--- a/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
+++ b/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
@@ -226,7 +226,7 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
     if (partialWithdrawalsEnabled) {
       withdrawBottomSheetRef.current?.snapToIndex(0)
     } else {
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'Exit' })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit' })
     }
   }
 
diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
index 90a312ab0d4..69960003129 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
@@ -55,10 +55,10 @@ describe('WithdrawBottomSheet', () => {
         />
       </Provider>
     )
-    expect(getByTestId('Earn/ActionCard/PartialWithdraw')).toBeTruthy()
-    fireEvent.press(getByTestId('Earn/ActionCard/PartialWithdraw'))
+    expect(getByTestId('Earn/ActionCard/withdraw')).toBeTruthy()
+    fireEvent.press(getByTestId('Earn/ActionCard/withdraw'))
     expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_select_withdraw_type, {
-      type: 'PartialWithdraw',
+      type: 'withdraw',
       providerId: mockEarnPositions[0].appId,
       poolId: mockEarnPositions[0].positionId,
       networkId: mockEarnPositions[0].networkId,
@@ -89,10 +89,10 @@ describe('WithdrawBottomSheet', () => {
         />
       </Provider>
     )
-    expect(getByTestId('Earn/ActionCard/Claim')).toBeTruthy()
-    fireEvent.press(getByTestId('Earn/ActionCard/Claim'))
+    expect(getByTestId('Earn/ActionCard/claim-rewards')).toBeTruthy()
+    fireEvent.press(getByTestId('Earn/ActionCard/claim-rewards'))
     expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_select_withdraw_type, {
-      type: 'Claim',
+      type: 'claim-rewards',
       providerId: mockEarnPositions[0].appId,
       poolId: mockEarnPositions[0].positionId,
       networkId: mockEarnPositions[0].networkId,
@@ -103,7 +103,7 @@ describe('WithdrawBottomSheet', () => {
         ...mockEarnPositions[0],
         balance: '100',
       },
-      mode: 'Claim',
+      mode: 'claim-rewards',
     })
   })
   it('tapping exit on WithdrawBottomSheet navigates to enter amount screen', () => {
@@ -119,10 +119,10 @@ describe('WithdrawBottomSheet', () => {
         />
       </Provider>
     )
-    expect(getByTestId('Earn/ActionCard/Exit')).toBeTruthy()
-    fireEvent.press(getByTestId('Earn/ActionCard/Exit'))
+    expect(getByTestId('Earn/ActionCard/exit')).toBeTruthy()
+    fireEvent.press(getByTestId('Earn/ActionCard/exit'))
     expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_select_withdraw_type, {
-      type: 'Exit',
+      type: 'exit',
       providerId: mockEarnPositions[0].appId,
       poolId: mockEarnPositions[0].positionId,
       networkId: mockEarnPositions[0].networkId,
@@ -133,7 +133,7 @@ describe('WithdrawBottomSheet', () => {
         ...mockEarnPositions[0],
         balance: '100',
       },
-      mode: 'Exit',
+      mode: 'exit',
     })
   })
   it('shows correct copy when ClaimType is Earnings', () => {
diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
index f58bc5171c7..76a8fd6ed74 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
@@ -29,7 +29,7 @@ function PartialWithdrawAction({
   const claimType = pool.dataProps.claimType
 
   const action: WithdrawAction = {
-    name: 'PartialWithdraw',
+    name: 'withdraw',
     title:
       hasRewards && pool.dataProps.withdrawalIncludesClaim
         ? t('earnFlow.poolInfoScreen.withdrawBottomSheet.withdrawAndClaim')
@@ -43,7 +43,7 @@ function PartialWithdrawAction({
     iconComponent: QuickActionsWithdraw,
     onPress: () => {
       AppAnalytics.track(EarnEvents.earn_select_withdraw_type, {
-        type: 'PartialWithdraw',
+        type: 'withdraw',
         providerId: pool.appId,
         poolId: pool.positionId,
         networkId: pool.networkId,
@@ -67,7 +67,7 @@ function ClaimAction({
   const claimType = pool.dataProps.claimType
 
   const action: WithdrawAction = {
-    name: 'Claim',
+    name: 'claim-rewards',
     title:
       claimType === 'rewards'
         ? t('earnFlow.poolInfoScreen.withdrawBottomSheet.claimRewards')
@@ -79,13 +79,13 @@ function ClaimAction({
     iconComponent: Trophy,
     onPress: () => {
       AppAnalytics.track(EarnEvents.earn_select_withdraw_type, {
-        type: 'Claim',
+        type: 'claim-rewards',
         providerId: pool.appId,
         poolId: pool.positionId,
         networkId: pool.networkId,
         depositTokenId: pool.dataProps.depositTokenId,
       })
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: action.name })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'claim-rewards' })
       forwardedRef.current?.close()
     },
   }
@@ -111,19 +111,19 @@ function ExitAction({
     : t('earnFlow.poolInfoScreen.withdrawBottomSheet.exitDescription')
 
   const action: WithdrawAction = {
-    name: 'Exit',
+    name: 'exit',
     title: t('earnFlow.poolInfoScreen.withdrawBottomSheet.exit'),
     details,
     iconComponent: Exit,
     onPress: () => {
       AppAnalytics.track(EarnEvents.earn_select_withdraw_type, {
-        type: 'Exit',
+        type: 'exit',
         providerId: pool.appId,
         poolId: pool.positionId,
         networkId: pool.networkId,
         depositTokenId: pool.dataProps.depositTokenId,
       })
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: action.name })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit' })
       forwardedRef.current?.close()
     },
   }
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 7844483c378..c60ba28a936 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import _ from 'lodash'
 import { useAsyncCallback } from 'react-async-hook'
-import { EarnEnterMode, PrepareWithdrawAndClaimParams } from 'src/earn/types'
+import { EarnActiveAction, PrepareWithdrawAndClaimParams } from 'src/earn/types'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { triggerShortcutRequest } from 'src/positions/saga'
 import { RawShortcutTransaction } from 'src/positions/slice'
@@ -34,7 +34,7 @@ export async function prepareDepositTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: EarnEnterMode
+  shortcutId: Exclude<EarnActiveAction, 'exit'>
 }) {
   const { enableAppFee } = getDynamicConfigParams(DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG])
   const args =
@@ -163,7 +163,7 @@ export async function prepareWithdrawTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: EarnEnterMode
+  shortcutId: Exclude<EarnActiveAction, 'exit'>
   useMax: boolean
 }) {
   const { dataProps } = pool
@@ -196,7 +196,7 @@ export async function prepareWithdrawTransactions({
   }
 }
 
-export function usePrepareTransactions(mode: EarnEnterMode) {
+export function usePrepareTransactions(mode: EarnActiveAction) {
   const prepareTransactions = useAsyncCallback(
     mode === 'withdraw' ? prepareWithdrawTransactions : prepareDepositTransactions,
     {
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 7c6a4b6e628..b74922282c1 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -9,7 +9,7 @@ export interface DepositInfo {
   amount: string
   preparedTransactions: SerializableTransactionRequest[]
   pool: EarnPosition
-  mode: EarnEnterMode
+  mode: EarnActiveAction
   fromTokenId: string
   fromTokenAmount: string
 }
@@ -58,8 +58,6 @@ export type BeforeDepositActionName =
   | 'CrossChainSwap'
   | 'Swap'
 
-export type WithdrawActionName = 'PartialWithdraw' | 'Claim' | 'Exit'
-
 export interface BeforeDepositAction {
   name: BeforeDepositActionName
   title: string
@@ -69,11 +67,11 @@ export interface BeforeDepositAction {
 }
 
 export interface WithdrawAction {
-  name: WithdrawActionName
+  name: EarnActiveAction
   title: string
   details: string
   iconComponent: React.MemoExoticComponent<({ color }: { color: Colors }) => JSX.Element>
   onPress: () => void
 }
 
-export type EarnEnterMode = 'deposit' | 'swap-deposit' | 'withdraw'
+export type EarnActiveAction = 'withdraw' | 'claim-rewards' | 'deposit' | 'swap-deposit' | 'exit'
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 6b741c0d0cd..c601ddf4818 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -1,6 +1,6 @@
 import { KycSchema } from '@fiatconnect/fiatconnect-types'
 import { SendOrigin, WalletConnectPairingOrigin } from 'src/analytics/types'
-import { EarnEnterMode, EarnTabType, WithdrawActionName } from 'src/earn/types'
+import { EarnActiveAction, EarnTabType } from 'src/earn/types'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
 import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
@@ -81,11 +81,11 @@ export type StackParamList = {
   [Screens.EarnInfoScreen]: undefined
   [Screens.EarnEnterAmount]: {
     pool: EarnPosition
-    mode?: EarnEnterMode
+    mode?: EarnActiveAction
   }
   [Screens.EarnConfirmationScreen]: {
     pool: EarnPosition
-    mode: WithdrawActionName
+    mode: EarnActiveAction
     inputAmount?: string
     useMax?: boolean
   }

From b5fc84e228b11aa73b871b116e34ddea95785b0f Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 24 Oct 2024 17:09:05 -0700
Subject: [PATCH 066/118] docs(earn): mapping EarnActiveAction exit to withdraw
 shortcutId

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 824a60051e7..74192bdefcf 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -170,7 +170,7 @@ function EarnEnterAmount({ route }: Props) {
       feeCurrencies,
       pool,
       hooksApiUrl,
-      // Mode is the same and shortcutId, except for exit which is withdraw
+      // Mode === shortcutId, except for exit which is withdraw
       shortcutId: mode === 'exit' ? 'withdraw' : mode,
       useMax: maxPressed,
     })

From 935409cf1510d3dc94cc2aebe4f4cf53f9b2e2e8 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 12:24:52 -0700
Subject: [PATCH 067/118] feat(earn): prepare transactions and use on
 confirmation screen

---
 src/earn/EarnConfirmationScreen.tsx |  64 ++++++++---
 src/earn/EarnEnterAmount.tsx        |  13 ++-
 src/earn/hooks.ts                   |  61 +++++++++--
 src/earn/prepareTransactions.ts     | 164 +++++++++++++++++-----------
 4 files changed, 207 insertions(+), 95 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 21a9d159f47..619980dd06e 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -1,6 +1,6 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import BigNumber from 'bignumber.js'
-import React, { useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { SafeAreaView, ScrollView, StyleSheet, Text, View } from 'react-native'
 import SkeletonPlaceholder from 'react-native-skeleton-placeholder'
@@ -10,7 +10,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import { usePrepareWithdrawAndClaimTransactions } from 'src/earn/hooks'
+import { usePrepareTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { EarnActiveAction } from 'src/earn/types'
@@ -29,6 +29,7 @@ import { Spacing } from 'src/styles/styles'
 import { useTokenInfo } from 'src/tokens/hooks'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
+import Logger from 'src/utils/Logger'
 import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { walletAddressSelector } from 'src/web3/selectors'
@@ -36,6 +37,9 @@ import { isAddress } from 'viem'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.EarnConfirmationScreen>
 
+const TAG = 'EarnConfirmationScreen'
+const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
+
 export default function EarnConfirmationScreen({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
@@ -74,20 +78,50 @@ export default function EarnConfirmationScreen({ route }: Props) {
     [withdrawToken, pool.pricePerShare, inputAmount]
   )
 
-  // Will need this to handle preparing a claim transaction, a withdrawal transaction and a withdrawal and claim transaction
   const {
-    result: prepareTransactionsResult,
-    loading: isPreparingTransactions,
-    error: prepareTransactionError,
-  } = usePrepareWithdrawAndClaimTransactions({
-    amount: new BigNumber(withdrawAmountInDepositToken).dividedBy(pool.pricePerShare[0]).toString(),
-    pool,
-    walletAddress,
-    feeCurrencies,
-    hooksApiUrl,
-    rewardsPositions,
-    useMax,
-  })
+    // @ts-expect-error prepareTransactionsResult & swapTransaction are only set when mode === 'deposit' or 'swap-deposit'
+    prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
+    refreshPreparedTransactions,
+    clearPreparedTransactions,
+    prepareTransactionError,
+    isPreparingTransactions,
+  } = usePrepareTransactions(mode)
+
+  const handleRefreshPreparedTransactions = (
+    amount: BigNumber,
+    token: TokenBalance,
+    feeCurrencies: TokenBalance[]
+  ) => {
+    if (!walletAddress || !isAddress(walletAddress)) {
+      Logger.error(TAG, 'Wallet address not set. Cannot refresh prepared transactions.')
+      return
+    }
+
+    return refreshPreparedTransactions({
+      amount: new BigNumber(amount).dividedBy(pool.pricePerShare[0]).toString(),
+      token,
+      walletAddress,
+      feeCurrencies,
+      pool,
+      hooksApiUrl,
+      // Mode === shortcutId, except for exit which is withdraw
+      shortcutId: mode === 'exit' ? 'withdraw' : mode,
+      useMax,
+    })
+  }
+
+  useEffect(() => {
+    clearPreparedTransactions()
+
+    const debouncedRefreshTransactions = setTimeout(() => {
+      return handleRefreshPreparedTransactions(
+        new BigNumber(withdrawAmountInDepositToken),
+        withdrawToken,
+        feeCurrencies
+      )
+    }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
+    return () => clearTimeout(debouncedRefreshTransactions)
+  }, [withdrawAmountInDepositToken, depositToken, feeCurrencies])
 
   const onPress = () => {
     if (prepareTransactionsResult?.type !== 'possible') {
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 74192bdefcf..104c51d3b30 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,7 +21,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import { usePrepareTransactions } from 'src/earn/prepareTransactions'
+import { usePrepareTransactions } from 'src/earn/hooks'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -144,6 +144,7 @@ function EarnEnterAmount({ route }: Props) {
   }
 
   const {
+    // @ts-expect-error prepareTransactionsResult & swapTransaction are only set when mode === 'deposit' or 'swap-deposit'
     prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,
@@ -483,11 +484,17 @@ function EarnEnterAmount({ route }: Props) {
             })}
             description={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.description', {
               feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
-              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
+              network:
+                NETWORK_NAMES[
+                  prepareTransactionsResult.feeCurrencies[0].networkId as keyof typeof NETWORK_NAMES
+                ],
             })}
             ctaLabel={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.noGasCta', {
               feeTokenSymbol: feeCurrencies[0].symbol,
-              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
+              network:
+                NETWORK_NAMES[
+                  prepareTransactionsResult.feeCurrencies[0].networkId as keyof typeof NETWORK_NAMES
+                ],
             })}
             onPressCta={() => {
               AppAnalytics.track(EarnEvents.earn_deposit_add_gas_press, {
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 0af004bb3de..b56cf9b5372 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -1,7 +1,12 @@
 import { useMemo } from 'react'
-import { useAsync } from 'react-async-hook'
-import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
-import { PrepareWithdrawAndClaimParams } from 'src/earn/types'
+import { useAsync, useAsyncCallback } from 'react-async-hook'
+import {
+  prepareClaimTransactions,
+  prepareDepositTransactions,
+  prepareWithdrawAndClaimTransactions,
+  prepareWithdrawTransactions,
+} from 'src/earn/prepareTransactions'
+import { EarnActiveAction } from 'src/earn/types'
 import { fetchExchanges } from 'src/fiatExchanges/utils'
 import { isAppSwapsEnabledSelector } from 'src/navigator/selectors'
 import { userLocationDataSelector } from 'src/networkInfo/selectors'
@@ -17,15 +22,6 @@ import { ensureError } from 'src/utils/ensureError'
 
 const TAG = 'earn/hooks'
 
-export function usePrepareWithdrawAndClaimTransactions(params: PrepareWithdrawAndClaimParams) {
-  return useAsync(() => prepareWithdrawAndClaimTransactions(params), [], {
-    onError: (err) => {
-      const error = ensureError(err)
-      Logger.error(TAG, 'usePrepareWithdrawAndClaimTransactions', error)
-    },
-  })
-}
-
 export function useEarnPositionProviderName(providerId: string) {
   const pools = useSelector(earnPositionsSelector)
   const providerName = pools.find((pool) => pool.appId === providerId)?.appName
@@ -94,3 +90,44 @@ export function useDepositEntrypointInfo({
   }, [asyncExchanges.result])
   return { hasDepositToken, hasTokensOnSameNetwork, hasTokensOnOtherNetworks, canCashIn, exchanges }
 }
+
+export function usePrepareTransactions(mode: EarnActiveAction) {
+  const getTransactionFunction = () => {
+    switch (mode) {
+      case 'deposit':
+      case 'swap-deposit':
+        return prepareDepositTransactions
+      case 'withdraw':
+        return prepareWithdrawTransactions
+      case 'claim-rewards':
+        return prepareClaimTransactions
+      case 'exit':
+        return prepareWithdrawAndClaimTransactions
+      default:
+        throw new Error(`Invalid mode: ${mode}`)
+    }
+  }
+
+  const prepareTransactions = useAsyncCallback(
+    async (args) => {
+      // Get the appropriate function based on the mode
+      const prepareFunction = getTransactionFunction()
+      // Ensure the function is called with the necessary arguments
+      return prepareFunction(args)
+    },
+    {
+      onError: (err) => {
+        const error = ensureError(err)
+        Logger.error(TAG, 'usePrepareTransactions - Error:', error)
+      },
+    }
+  )
+
+  return {
+    prepareTransactionsResult: prepareTransactions.result,
+    refreshPreparedTransactions: prepareTransactions.execute,
+    clearPreparedTransactions: prepareTransactions.reset,
+    prepareTransactionError: prepareTransactions.error,
+    isPreparingTransactions: prepareTransactions.loading,
+  }
+}
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index c60ba28a936..5cc6d99ac8c 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,19 +1,16 @@
 import BigNumber from 'bignumber.js'
-import _ from 'lodash'
-import { useAsyncCallback } from 'react-async-hook'
-import { EarnActiveAction, PrepareWithdrawAndClaimParams } from 'src/earn/types'
+import { EarnActiveAction } from 'src/earn/types'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { triggerShortcutRequest } from 'src/positions/saga'
 import { RawShortcutTransaction } from 'src/positions/slice'
 import { rawShortcutTransactionsToTransactionRequests } from 'src/positions/transactions'
-import { EarnPosition } from 'src/positions/types'
+import { EarnPosition, Position } from 'src/positions/types'
 import { getDynamicConfigParams } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { SwapTransaction } from 'src/swap/types'
 import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
-import { ensureError } from 'src/utils/ensureError'
 import { prepareTransactions } from 'src/viem/prepareTransactions'
 import { Address } from 'viem'
 
@@ -36,6 +33,7 @@ export async function prepareDepositTransactions({
   hooksApiUrl: string
   shortcutId: Exclude<EarnActiveAction, 'exit'>
 }) {
+  const { appId, networkId } = pool
   const { enableAppFee } = getDynamicConfigParams(DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG])
   const args =
     shortcutId === 'deposit'
@@ -64,8 +62,8 @@ export async function prepareDepositTransactions({
   }: { transactions: RawShortcutTransaction[]; dataProps?: { swapTransaction: SwapTransaction } } =
     await triggerShortcutRequest(hooksApiUrl, {
       address: walletAddress,
-      appId: pool.appId,
-      networkId: pool.networkId,
+      appId,
+      networkId,
       shortcutId,
       ...args,
       ...pool.shortcutTriggerArgs?.[shortcutId],
@@ -94,15 +92,21 @@ export async function prepareDepositTransactions({
 }
 
 export async function prepareWithdrawAndClaimTransactions({
-  pool,
+  token,
   walletAddress,
   feeCurrencies,
+  pool,
   hooksApiUrl,
   rewardsPositions,
-  amount,
-  useMax = true,
-}: PrepareWithdrawAndClaimParams) {
-  const { dataProps, balance, appId, networkId, shortcutTriggerArgs } = pool
+}: {
+  token: TokenBalance
+  walletAddress: Address
+  feeCurrencies: TokenBalance[]
+  pool: EarnPosition
+  hooksApiUrl: string
+  rewardsPositions?: Position[]
+}) {
+  const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
   const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
     await triggerShortcutRequest(hooksApiUrl, {
       address: walletAddress,
@@ -112,39 +116,43 @@ export async function prepareWithdrawAndClaimTransactions({
       tokens: [
         {
           tokenId: dataProps.withdrawTokenId,
-          amount: useMax ? balance : amount,
-          useMax,
+          amount: balance,
+          useMax: true,
         },
       ],
       ...shortcutTriggerArgs?.withdraw,
     })
-  const claimTransactions = await Promise.all(
-    rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-      const { transactions }: { transactions: RawShortcutTransaction[] } =
-        await triggerShortcutRequest(hooksApiUrl, {
-          address: walletAddress,
-          appId,
-          networkId,
-          shortcutId: 'claim-rewards',
-          ...position.shortcutTriggerArgs?.['claim-rewards'],
+
+  // Prepare the claim transactions if there are rewards positions
+  const claimTransactions = rewardsPositions
+    ? await Promise.all(
+        rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+          const { transactions }: { transactions?: RawShortcutTransaction[] } =
+            await triggerShortcutRequest(hooksApiUrl, {
+              address: walletAddress,
+              appId,
+              networkId,
+              shortcutId: 'claim-rewards',
+              ...position.shortcutTriggerArgs?.['claim-rewards'],
+            })
+          return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
         })
-      return transactions
-    })
-  )
-  Logger.debug(TAG, 'prepareWithdrawAndClaimTransactions', {
-    withdrawTransactions,
-    claimTransactions,
-    pool,
-  })
-  return prepareTransactions({
-    feeCurrencies,
-    baseTransactions: rawShortcutTransactionsToTransactionRequests([
-      ...withdrawTransactions,
-      ..._.flatten(claimTransactions),
-    ]),
-    isGasSubsidized: isGasSubsidizedForNetwork(pool.networkId),
-    origin: 'earn-withdraw',
-  })
+      )
+    : []
+
+  return {
+    prepareTransactionsResult: await prepareTransactions({
+      feeCurrencies,
+      baseTransactions: rawShortcutTransactionsToTransactionRequests([
+        ...withdrawTransactions,
+        ...claimTransactions.flat(),
+      ]),
+      spendToken: token,
+      spendTokenAmount: new BigNumber(balance).shiftedBy(token.decimals),
+      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+      origin: 'earn-withdraw',
+    }),
+  }
 }
 
 export async function prepareWithdrawTransactions({
@@ -154,7 +162,6 @@ export async function prepareWithdrawTransactions({
   feeCurrencies,
   pool,
   hooksApiUrl,
-  shortcutId,
   useMax,
 }: {
   amount: string
@@ -166,22 +173,22 @@ export async function prepareWithdrawTransactions({
   shortcutId: Exclude<EarnActiveAction, 'exit'>
   useMax: boolean
 }) {
-  const { dataProps } = pool
+  const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
   const { transactions }: { transactions: RawShortcutTransaction[] } = await triggerShortcutRequest(
     hooksApiUrl,
     {
       address: walletAddress,
-      appId: pool.appId,
-      networkId: pool.networkId,
-      shortcutId,
+      appId,
+      networkId,
+      shortcutId: 'withdraw',
       tokens: [
         {
           tokenId: dataProps.withdrawTokenId,
-          amount,
+          amount: useMax ? balance : amount,
           useMax,
         },
       ],
-      ...pool.shortcutTriggerArgs?.[shortcutId],
+      ...shortcutTriggerArgs?.withdraw,
     }
   )
 
@@ -189,29 +196,56 @@ export async function prepareWithdrawTransactions({
     prepareTransactionsResult: await prepareTransactions({
       feeCurrencies,
       baseTransactions: rawShortcutTransactionsToTransactionRequests(transactions),
-      isGasSubsidized: isGasSubsidizedForNetwork(token.networkId),
-      origin: `earn-${shortcutId}`,
+      spendToken: token,
+      spendTokenAmount: new BigNumber(amount).shiftedBy(token.decimals),
+      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+      origin: 'earn-withdraw',
     }),
-    swapTransaction: undefined,
   }
 }
 
-export function usePrepareTransactions(mode: EarnActiveAction) {
-  const prepareTransactions = useAsyncCallback(
-    mode === 'withdraw' ? prepareWithdrawTransactions : prepareDepositTransactions,
-    {
-      onError: (err) => {
-        const error = ensureError(err)
-        Logger.error(TAG, 'usePrepareWithdrawTransactions', error)
-      },
-    }
-  )
+export async function prepareClaimTransactions({
+  pool,
+  walletAddress,
+  feeCurrencies,
+  hooksApiUrl,
+  rewardsPositions,
+}: {
+  pool: EarnPosition
+  walletAddress: Address
+  feeCurrencies: TokenBalance[]
+  hooksApiUrl: string
+  rewardsPositions: Position[]
+}) {
+  const { appId, networkId } = pool
 
+  // Prepare the claim transactions if there are rewards positions
+  const claimTransactions = rewardsPositions
+    ? await Promise.all(
+        rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+          const { transactions }: { transactions?: RawShortcutTransaction[] } =
+            await triggerShortcutRequest(hooksApiUrl, {
+              address: walletAddress,
+              appId,
+              networkId,
+              shortcutId: 'claim-rewards',
+              ...position.shortcutTriggerArgs?.['claim-rewards'],
+            })
+          return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+        })
+      )
+    : []
+
+  Logger.debug(TAG, 'prepareClaimTransactions', {
+    claimTransactions,
+    pool,
+  })
   return {
-    prepareTransactionsResult: prepareTransactions.result,
-    refreshPreparedTransactions: prepareTransactions.execute,
-    clearPreparedTransactions: prepareTransactions.reset,
-    prepareTransactionError: prepareTransactions.error,
-    isPreparingTransactions: prepareTransactions.loading,
+    prepareTransactionsResult: await prepareTransactions({
+      feeCurrencies,
+      baseTransactions: rawShortcutTransactionsToTransactionRequests(claimTransactions.flat()),
+      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+      origin: 'earn-claim-rewards',
+    }),
   }
 }

From e9f2c075215324c83c03db3c107e9b1a62df6523 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 13:57:17 -0700
Subject: [PATCH 068/118] fix(earn): check rewardsPositions length

---
 src/earn/prepareTransactions.ts | 62 +++++++++++++++++----------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 5cc6d99ac8c..2b925989c2f 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -124,21 +124,22 @@ export async function prepareWithdrawAndClaimTransactions({
     })
 
   // Prepare the claim transactions if there are rewards positions
-  const claimTransactions = rewardsPositions
-    ? await Promise.all(
-        rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-          const { transactions }: { transactions?: RawShortcutTransaction[] } =
-            await triggerShortcutRequest(hooksApiUrl, {
-              address: walletAddress,
-              appId,
-              networkId,
-              shortcutId: 'claim-rewards',
-              ...position.shortcutTriggerArgs?.['claim-rewards'],
-            })
-          return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
-        })
-      )
-    : []
+  const claimTransactions =
+    rewardsPositions && rewardsPositions.length > 0
+      ? await Promise.all(
+          rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+            const { transactions }: { transactions?: RawShortcutTransaction[] } =
+              await triggerShortcutRequest(hooksApiUrl, {
+                address: walletAddress,
+                appId,
+                networkId,
+                shortcutId: 'claim-rewards',
+                ...position.shortcutTriggerArgs?.['claim-rewards'],
+              })
+            return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+          })
+        )
+      : []
 
   return {
     prepareTransactionsResult: await prepareTransactions({
@@ -220,21 +221,22 @@ export async function prepareClaimTransactions({
   const { appId, networkId } = pool
 
   // Prepare the claim transactions if there are rewards positions
-  const claimTransactions = rewardsPositions
-    ? await Promise.all(
-        rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-          const { transactions }: { transactions?: RawShortcutTransaction[] } =
-            await triggerShortcutRequest(hooksApiUrl, {
-              address: walletAddress,
-              appId,
-              networkId,
-              shortcutId: 'claim-rewards',
-              ...position.shortcutTriggerArgs?.['claim-rewards'],
-            })
-          return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
-        })
-      )
-    : []
+  const claimTransactions =
+    rewardsPositions.length > 0
+      ? await Promise.all(
+          rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+            const { transactions }: { transactions?: RawShortcutTransaction[] } =
+              await triggerShortcutRequest(hooksApiUrl, {
+                address: walletAddress,
+                appId,
+                networkId,
+                shortcutId: 'claim-rewards',
+                ...position.shortcutTriggerArgs?.['claim-rewards'],
+              })
+            return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+          })
+        )
+      : []
 
   Logger.debug(TAG, 'prepareClaimTransactions', {
     claimTransactions,

From 98a8bd00d6a0d1ecef892ad8d7bdc34d39e86b63 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 14:06:15 -0700
Subject: [PATCH 069/118] fix(earn): remove conditional shortcutId assignment
 based on mode

---
 src/earn/EarnConfirmationScreen.tsx | 3 +--
 src/earn/EarnEnterAmount.tsx        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 619980dd06e..e26ff0666d9 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -104,8 +104,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
       feeCurrencies,
       pool,
       hooksApiUrl,
-      // Mode === shortcutId, except for exit which is withdraw
-      shortcutId: mode === 'exit' ? 'withdraw' : mode,
+      shortcutId: mode,
       useMax,
     })
   }
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 104c51d3b30..a209e208c75 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -171,8 +171,7 @@ function EarnEnterAmount({ route }: Props) {
       feeCurrencies,
       pool,
       hooksApiUrl,
-      // Mode === shortcutId, except for exit which is withdraw
-      shortcutId: mode === 'exit' ? 'withdraw' : mode,
+      shortcutId: mode,
       useMax: maxPressed,
     })
   }

From f1ac2db1493e21eb57a8477ad2dcb91408896a01 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 14:06:57 -0700
Subject: [PATCH 070/118] fix(earn): make rewardsPositions type optional

---
 src/earn/prepareTransactions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 2b925989c2f..7ac8e2dad91 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -216,13 +216,13 @@ export async function prepareClaimTransactions({
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   hooksApiUrl: string
-  rewardsPositions: Position[]
+  rewardsPositions?: Position[]
 }) {
   const { appId, networkId } = pool
 
   // Prepare the claim transactions if there are rewards positions
   const claimTransactions =
-    rewardsPositions.length > 0
+    rewardsPositions && rewardsPositions.length > 0
       ? await Promise.all(
           rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
             const { transactions }: { transactions?: RawShortcutTransaction[] } =

From 37dd5bb44cdfdc9c9ba07a3fd6bf3b27ded71b60 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 14:29:56 -0700
Subject: [PATCH 071/118] chore(earn): remove unused
 PrepareWithdrawAndClaimParams

---
 src/earn/types.ts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/earn/types.ts b/src/earn/types.ts
index b74922282c1..621b94262d6 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -1,9 +1,8 @@
-import { EarnPosition, Position, Token } from 'src/positions/types'
+import { EarnPosition, Token } from 'src/positions/types'
 import Colors from 'src/styles/colors'
-import { TokenBalance } from 'src/tokens/slice'
 import { NetworkId } from 'src/transactions/types'
 import { SerializableTransactionRequest } from 'src/viem/preparedTransactionSerialization'
-import { Address, Hash } from 'viem'
+import { Hash } from 'viem'
 
 export interface DepositInfo {
   amount: string
@@ -41,16 +40,6 @@ export interface PoolInfo {
   apy: number
 }
 
-export interface PrepareWithdrawAndClaimParams {
-  pool: EarnPosition
-  walletAddress: Address
-  feeCurrencies: TokenBalance[]
-  hooksApiUrl: string
-  rewardsPositions: Position[]
-  amount?: string
-  useMax?: boolean
-}
-
 export type BeforeDepositActionName =
   | 'Add'
   | 'Transfer'

From 34379cf203021ea88225c7efcf6871c06313ddc8 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 15:17:47 -0700
Subject: [PATCH 072/118] fix(earn-confirmation): remove unused swap
 transaction

---
 src/earn/EarnConfirmationScreen.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index e26ff0666d9..dfb597665e1 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -79,8 +79,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
   )
 
   const {
-    // @ts-expect-error prepareTransactionsResult & swapTransaction are only set when mode === 'deposit' or 'swap-deposit'
-    prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
+    prepareTransactionsResult: { prepareTransactionsResult } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,
     prepareTransactionError,

From 9f2d5301ee2e1aafce25be7e5a14a34f9787a94c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 15:18:53 -0700
Subject: [PATCH 073/118] docs(earn-enter-amount): update ts-expect-error
 expect error

---
 src/earn/EarnEnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index a209e208c75..2d45561f4c8 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -144,7 +144,7 @@ function EarnEnterAmount({ route }: Props) {
   }
 
   const {
-    // @ts-expect-error prepareTransactionsResult & swapTransaction are only set when mode === 'deposit' or 'swap-deposit'
+    // @ts-expect-error swapTransaction only exists on swap-deposit mode
     prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,

From 5a1af5d6c0b58e3882d999e74f439c5ede09f2c1 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 25 Oct 2024 17:23:00 -0700
Subject: [PATCH 074/118] fix(earn): add args to usePrepareTransactions for
 claim

---
 src/earn/EarnConfirmationScreen.tsx |  2 +-
 src/earn/hooks.ts                   | 14 +++++--
 src/earn/prepareTransactions.ts     | 62 +++++++++++++----------------
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index dfb597665e1..1967c2d7aa9 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -84,7 +84,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = usePrepareTransactions(mode)
+  } = usePrepareTransactions(mode, { rewardsPositions })
 
   const handleRefreshPreparedTransactions = (
     amount: BigNumber,
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index b56cf9b5372..ec16bad72e1 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -11,7 +11,7 @@ import { fetchExchanges } from 'src/fiatExchanges/utils'
 import { isAppSwapsEnabledSelector } from 'src/navigator/selectors'
 import { userLocationDataSelector } from 'src/networkInfo/selectors'
 import { earnPositionsSelector } from 'src/positions/selectors'
-import { EarnPosition } from 'src/positions/types'
+import { EarnPosition, Position } from 'src/positions/types'
 import { useSelector } from 'src/redux/hooks'
 import { getFeatureGate } from 'src/statsig'
 import { StatsigFeatureGates } from 'src/statsig/types'
@@ -91,7 +91,10 @@ export function useDepositEntrypointInfo({
   return { hasDepositToken, hasTokensOnSameNetwork, hasTokensOnOtherNetworks, canCashIn, exchanges }
 }
 
-export function usePrepareTransactions(mode: EarnActiveAction) {
+export function usePrepareTransactions(
+  mode: EarnActiveAction,
+  additionalArgs?: { rewardsPositions: Position[] }
+) {
   const getTransactionFunction = () => {
     switch (mode) {
       case 'deposit':
@@ -110,10 +113,15 @@ export function usePrepareTransactions(mode: EarnActiveAction) {
 
   const prepareTransactions = useAsyncCallback(
     async (args) => {
+      const modifiedArgs = { ...args }
+      // Add rewardsPositions passed to usePrepareTransactions if the mode is 'exit' or 'claim-rewards'
+      if (mode === 'exit' || mode === 'claim-rewards') {
+        modifiedArgs.rewardsPositions = additionalArgs?.rewardsPositions
+      }
       // Get the appropriate function based on the mode
       const prepareFunction = getTransactionFunction()
       // Ensure the function is called with the necessary arguments
-      return prepareFunction(args)
+      return prepareFunction(modifiedArgs)
     },
     {
       onError: (err) => {
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 7ac8e2dad91..c720839d183 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -104,7 +104,7 @@ export async function prepareWithdrawAndClaimTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  rewardsPositions?: Position[]
+  rewardsPositions: Position[]
 }) {
   const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
   const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
@@ -124,22 +124,19 @@ export async function prepareWithdrawAndClaimTransactions({
     })
 
   // Prepare the claim transactions if there are rewards positions
-  const claimTransactions =
-    rewardsPositions && rewardsPositions.length > 0
-      ? await Promise.all(
-          rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-            const { transactions }: { transactions?: RawShortcutTransaction[] } =
-              await triggerShortcutRequest(hooksApiUrl, {
-                address: walletAddress,
-                appId,
-                networkId,
-                shortcutId: 'claim-rewards',
-                ...position.shortcutTriggerArgs?.['claim-rewards'],
-              })
-            return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
-          })
-        )
-      : []
+  const claimTransactions = await Promise.all(
+    rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+      const { transactions }: { transactions?: RawShortcutTransaction[] } =
+        await triggerShortcutRequest(hooksApiUrl, {
+          address: walletAddress,
+          appId,
+          networkId,
+          shortcutId: 'claim-rewards',
+          ...position.shortcutTriggerArgs?.['claim-rewards'],
+        })
+      return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+    })
+  )
 
   return {
     prepareTransactionsResult: await prepareTransactions({
@@ -216,27 +213,24 @@ export async function prepareClaimTransactions({
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   hooksApiUrl: string
-  rewardsPositions?: Position[]
+  rewardsPositions: Position[]
 }) {
   const { appId, networkId } = pool
 
   // Prepare the claim transactions if there are rewards positions
-  const claimTransactions =
-    rewardsPositions && rewardsPositions.length > 0
-      ? await Promise.all(
-          rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-            const { transactions }: { transactions?: RawShortcutTransaction[] } =
-              await triggerShortcutRequest(hooksApiUrl, {
-                address: walletAddress,
-                appId,
-                networkId,
-                shortcutId: 'claim-rewards',
-                ...position.shortcutTriggerArgs?.['claim-rewards'],
-              })
-            return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
-          })
-        )
-      : []
+  const claimTransactions = await Promise.all(
+    rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+      const { transactions }: { transactions?: RawShortcutTransaction[] } =
+        await triggerShortcutRequest(hooksApiUrl, {
+          address: walletAddress,
+          appId,
+          networkId,
+          shortcutId: 'claim-rewards',
+          ...position.shortcutTriggerArgs?.['claim-rewards'],
+        })
+      return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+    })
+  )
 
   Logger.debug(TAG, 'prepareClaimTransactions', {
     claimTransactions,

From d5792a4af24539cfa1bba24e0ff631fda010b12b Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 09:13:49 -0700
Subject: [PATCH 075/118] style(earn): renameEarnActiveAction to EarnActiveMode

---
 src/analytics/Properties.tsx             | 10 +++++-----
 src/earn/EarnConfirmationScreen.tsx      |  4 ++--
 src/earn/EarnDepositBottomSheet.test.tsx |  6 +++---
 src/earn/EarnDepositBottomSheet.tsx      |  4 ++--
 src/earn/prepareTransactions.ts          |  8 ++++----
 src/earn/types.ts                        |  6 +++---
 src/navigator/types.tsx                  |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 1b5a731455a..a57f90e8533 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -54,7 +54,7 @@ import { ErrorMessages } from 'src/app/ErrorMessages'
 import { AddAssetsActionType } from 'src/components/AddAssetsBottomSheet'
 import { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { DappSection } from 'src/dapps/types'
-import { BeforeDepositActionName, EarnActiveAction, SerializableRewardsInfo } from 'src/earn/types'
+import { BeforeDepositActionName, EarnActiveMode, SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
@@ -590,7 +590,7 @@ interface SendEventsProperties {
     tokenId: string
     tokenAddress: string | null
     networkId: NetworkId | null
-    mode?: EarnActiveAction
+    mode?: EarnActiveMode
   }
   [SendEvents.swap_input_pressed]: {
     swapToLocalAmount: boolean
@@ -1554,7 +1554,7 @@ export interface EarnCommonProperties {
 
 interface EarnDepositProperties extends EarnCommonProperties {
   depositTokenAmount: string
-  mode: EarnActiveAction
+  mode: EarnActiveMode
   // the below are mainly for swap-deposit. For deposit, this would just be
   // same as the depositTokenAmount and depositTokenId
   fromTokenAmount: string
@@ -1599,7 +1599,7 @@ interface EarnEventsProperties {
   [EarnEvents.earn_enter_amount_continue_press]: {
     amountInUsd: string
     amountEnteredIn: AmountEnteredIn
-    mode: EarnActiveAction
+    mode: EarnActiveMode
     // For deposits these will be the same as the depositTokenId and depositTokenAmount
     // For swaps these will be the swapFromTokenId and swapFromTokenAmount
     // For withdrawals this will be in units of the depositToken
@@ -1642,7 +1642,7 @@ interface EarnEventsProperties {
   [EarnEvents.earn_pool_info_tap_safety_details]: EarnCommonProperties & {
     action: 'expand' | 'collapse'
   }
-  [EarnEvents.earn_select_withdraw_type]: EarnCommonProperties & { type: EarnActiveAction }
+  [EarnEvents.earn_select_withdraw_type]: EarnCommonProperties & { type: EarnActiveMode }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 21a9d159f47..378b1e2a9f8 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -13,7 +13,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { usePrepareWithdrawAndClaimTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
-import { EarnActiveAction } from 'src/earn/types'
+import { EarnActiveMode } from 'src/earn/types'
 import { getEarnPositionBalanceValues, isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
@@ -317,7 +317,7 @@ function GasFee({
   )
 }
 
-function Title({ mode }: { mode: EarnActiveAction }) {
+function Title({ mode }: { mode: EarnActiveMode }) {
   const { t } = useTranslation()
   switch (mode) {
     case 'claim-rewards':
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index fd1084dcddf..80029bea70f 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -7,7 +7,7 @@ import { EarnEvents } from 'src/analytics/Events'
 import { openUrl } from 'src/app/actions'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { depositStart } from 'src/earn/slice'
-import { EarnActiveAction } from 'src/earn/types'
+import { EarnActiveMode } from 'src/earn/types'
 import * as earnUtils from 'src/earn/utils'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
@@ -58,13 +58,13 @@ const mockDepositProps = {
   inputAmount: new BigNumber(100),
   preparedTransaction: mockPreparedTransaction,
   pool: mockEarnPositions[0],
-  mode: 'deposit' as EarnActiveAction,
+  mode: 'deposit' as EarnActiveMode,
   inputTokenId: mockArbUsdcTokenId,
 }
 
 const mockSwapDepositProps = {
   ...mockDepositProps,
-  mode: 'swap-deposit' as EarnActiveAction,
+  mode: 'swap-deposit' as EarnActiveMode,
   inputTokenId: mockArbEthTokenId,
   inputAmount: new BigNumber(0.041),
   swapTransaction: {
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 30bf4d1b098..df425eb316a 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -11,7 +11,7 @@ import { LabelWithInfo } from 'src/components/LabelWithInfo'
 import TokenDisplay from 'src/components/TokenDisplay'
 import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
-import { EarnActiveAction } from 'src/earn/types'
+import { EarnActiveMode } from 'src/earn/types'
 import {
   getSwapToAmountInDecimals,
   getTotalYieldRate,
@@ -50,7 +50,7 @@ export default function EarnDepositBottomSheet({
   inputTokenId: string
   inputAmount: BigNumber
   pool: EarnPosition
-  mode: EarnActiveAction
+  mode: EarnActiveMode
   swapTransaction?: SwapTransaction
 }) {
   const { t } = useTranslation()
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index c60ba28a936..c65148170b5 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import _ from 'lodash'
 import { useAsyncCallback } from 'react-async-hook'
-import { EarnActiveAction, PrepareWithdrawAndClaimParams } from 'src/earn/types'
+import { EarnActiveMode, PrepareWithdrawAndClaimParams } from 'src/earn/types'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { triggerShortcutRequest } from 'src/positions/saga'
 import { RawShortcutTransaction } from 'src/positions/slice'
@@ -34,7 +34,7 @@ export async function prepareDepositTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: Exclude<EarnActiveAction, 'exit'>
+  shortcutId: Exclude<EarnActiveMode, 'exit'>
 }) {
   const { enableAppFee } = getDynamicConfigParams(DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG])
   const args =
@@ -163,7 +163,7 @@ export async function prepareWithdrawTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: Exclude<EarnActiveAction, 'exit'>
+  shortcutId: Exclude<EarnActiveMode, 'exit'>
   useMax: boolean
 }) {
   const { dataProps } = pool
@@ -196,7 +196,7 @@ export async function prepareWithdrawTransactions({
   }
 }
 
-export function usePrepareTransactions(mode: EarnActiveAction) {
+export function usePrepareTransactions(mode: EarnActiveMode) {
   const prepareTransactions = useAsyncCallback(
     mode === 'withdraw' ? prepareWithdrawTransactions : prepareDepositTransactions,
     {
diff --git a/src/earn/types.ts b/src/earn/types.ts
index b74922282c1..0c28277a67b 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -9,7 +9,7 @@ export interface DepositInfo {
   amount: string
   preparedTransactions: SerializableTransactionRequest[]
   pool: EarnPosition
-  mode: EarnActiveAction
+  mode: EarnActiveMode
   fromTokenId: string
   fromTokenAmount: string
 }
@@ -67,11 +67,11 @@ export interface BeforeDepositAction {
 }
 
 export interface WithdrawAction {
-  name: EarnActiveAction
+  name: EarnActiveMode
   title: string
   details: string
   iconComponent: React.MemoExoticComponent<({ color }: { color: Colors }) => JSX.Element>
   onPress: () => void
 }
 
-export type EarnActiveAction = 'withdraw' | 'claim-rewards' | 'deposit' | 'swap-deposit' | 'exit'
+export type EarnActiveMode = 'withdraw' | 'claim-rewards' | 'deposit' | 'swap-deposit' | 'exit'
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index c601ddf4818..5523f253fea 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -1,6 +1,6 @@
 import { KycSchema } from '@fiatconnect/fiatconnect-types'
 import { SendOrigin, WalletConnectPairingOrigin } from 'src/analytics/types'
-import { EarnActiveAction, EarnTabType } from 'src/earn/types'
+import { EarnActiveMode, EarnTabType } from 'src/earn/types'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
 import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
@@ -81,11 +81,11 @@ export type StackParamList = {
   [Screens.EarnInfoScreen]: undefined
   [Screens.EarnEnterAmount]: {
     pool: EarnPosition
-    mode?: EarnActiveAction
+    mode?: EarnActiveMode
   }
   [Screens.EarnConfirmationScreen]: {
     pool: EarnPosition
-    mode: EarnActiveAction
+    mode: EarnActiveMode
     inputAmount?: string
     useMax?: boolean
   }

From fb877dce87d5b500727d7222c29e835e422adc70 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 09:22:48 -0700
Subject: [PATCH 076/118] chore: remove extra arg and add logger

---
 src/earn/prepareTransactions.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 0a8b380b1bc..460909bc776 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -137,6 +137,11 @@ export async function prepareWithdrawAndClaimTransactions({
       return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
     })
   )
+  Logger.debug(TAG, 'prepareWithdrawAndClaimTransactions', {
+    withdrawTransactions,
+    claimTransactions,
+    pool,
+  })
 
   return {
     prepareTransactionsResult: await prepareTransactions({
@@ -168,7 +173,6 @@ export async function prepareWithdrawTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: Exclude<EarnActiveMode, 'exit'>
   useMax: boolean
 }) {
   const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool

From d744664a53c2715e5907bf3cbea52bd9670ad89a Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 10:48:26 -0700
Subject: [PATCH 077/118] chore(earn): restrict types for confirmation and
 enter amount

---
 src/earn/EarnConfirmationScreen.tsx | 2 +-
 src/earn/EarnEnterAmount.tsx        | 3 +--
 src/navigator/types.tsx             | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 378b1e2a9f8..fbdbb1754bf 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -317,7 +317,7 @@ function GasFee({
   )
 }
 
-function Title({ mode }: { mode: EarnActiveMode }) {
+function Title({ mode }: { mode: Exclude<EarnActiveMode, 'deposit' | 'swap-deposit'> }) {
   const { t } = useTranslation()
   switch (mode) {
     case 'claim-rewards':
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 74192bdefcf..be722e6e0d1 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -170,8 +170,7 @@ function EarnEnterAmount({ route }: Props) {
       feeCurrencies,
       pool,
       hooksApiUrl,
-      // Mode === shortcutId, except for exit which is withdraw
-      shortcutId: mode === 'exit' ? 'withdraw' : mode,
+      shortcutId: mode,
       useMax: maxPressed,
     })
   }
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 5523f253fea..f11c77671c0 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -81,11 +81,11 @@ export type StackParamList = {
   [Screens.EarnInfoScreen]: undefined
   [Screens.EarnEnterAmount]: {
     pool: EarnPosition
-    mode?: EarnActiveMode
+    mode?: Exclude<EarnActiveMode, 'claim-rewards' | 'exit'>
   }
   [Screens.EarnConfirmationScreen]: {
     pool: EarnPosition
-    mode: EarnActiveMode
+    mode: Exclude<EarnActiveMode, 'deposit' | 'swap-deposit'>
     inputAmount?: string
     useMax?: boolean
   }

From 3f3ed88819b2213b31636036484eb1b744e8bc4d Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 11:47:04 -0700
Subject: [PATCH 078/118] fix(earn): remove unneeded props from prepare
 transaction functions

---
 src/earn/hooks.ts                    | 4 ++--
 src/earn/prepareTransactions.test.ts | 8 ++++----
 src/earn/prepareTransactions.ts      | 8 --------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index ec16bad72e1..819218ef7bf 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -6,7 +6,7 @@ import {
   prepareWithdrawAndClaimTransactions,
   prepareWithdrawTransactions,
 } from 'src/earn/prepareTransactions'
-import { EarnActiveAction } from 'src/earn/types'
+import { EarnActiveMode } from 'src/earn/types'
 import { fetchExchanges } from 'src/fiatExchanges/utils'
 import { isAppSwapsEnabledSelector } from 'src/navigator/selectors'
 import { userLocationDataSelector } from 'src/networkInfo/selectors'
@@ -92,7 +92,7 @@ export function useDepositEntrypointInfo({
 }
 
 export function usePrepareTransactions(
-  mode: EarnActiveAction,
+  mode: EarnActiveMode,
   additionalArgs?: { rewardsPositions: Position[] }
 ) {
   const getTransactionFunction = () => {
diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index ee3b153dc07..56b117cf43b 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -299,6 +299,7 @@ describe('prepareTransactions', () => {
           data: '0xencodedData',
           gas: BigInt(50200),
           _estimatedGasUse: BigInt(49900),
+          value: undefined,
         },
         {
           from: '0x1234',
@@ -306,9 +307,10 @@ describe('prepareTransactions', () => {
           data: '0xencodedData',
           gas: BigInt(50100),
           _estimatedGasUse: BigInt(49800),
+          value: undefined,
         },
       ]
-      expect(result).toEqual({
+      expect(result.prepareTransactionsResult).toEqual({
         type: 'possible',
         feeCurrency: mockFeeCurrency,
         transactions: expectedTransactions,
@@ -362,7 +364,7 @@ describe('prepareTransactions', () => {
           _estimatedGasUse: BigInt(49900),
         },
       ]
-      expect(result).toEqual({
+      expect(result.prepareTransactionsResult).toEqual({
         type: 'possible',
         feeCurrency: mockFeeCurrency,
         transactions: expectedTransactions,
@@ -410,12 +412,10 @@ describe('prepareTransactions', () => {
 
       const result = await prepareWithdrawTransactions({
         amount: '10',
-        token: mockToken,
         walletAddress: '0x1234',
         feeCurrencies: [mockFeeCurrency],
         pool: mockEarnPositions[0],
         hooksApiUrl: 'https://hooks.api',
-        shortcutId: 'withdraw',
         useMax: false,
       })
 
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 460909bc776..a1c1334f29a 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -92,14 +92,12 @@ export async function prepareDepositTransactions({
 }
 
 export async function prepareWithdrawAndClaimTransactions({
-  token,
   walletAddress,
   feeCurrencies,
   pool,
   hooksApiUrl,
   rewardsPositions,
 }: {
-  token: TokenBalance
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
@@ -150,8 +148,6 @@ export async function prepareWithdrawAndClaimTransactions({
         ...withdrawTransactions,
         ...claimTransactions.flat(),
       ]),
-      spendToken: token,
-      spendTokenAmount: new BigNumber(balance).shiftedBy(token.decimals),
       isGasSubsidized: isGasSubsidizedForNetwork(networkId),
       origin: 'earn-withdraw',
     }),
@@ -160,7 +156,6 @@ export async function prepareWithdrawAndClaimTransactions({
 
 export async function prepareWithdrawTransactions({
   amount,
-  token,
   walletAddress,
   feeCurrencies,
   pool,
@@ -168,7 +163,6 @@ export async function prepareWithdrawTransactions({
   useMax,
 }: {
   amount: string
-  token: TokenBalance
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
@@ -198,8 +192,6 @@ export async function prepareWithdrawTransactions({
     prepareTransactionsResult: await prepareTransactions({
       feeCurrencies,
       baseTransactions: rawShortcutTransactionsToTransactionRequests(transactions),
-      spendToken: token,
-      spendTokenAmount: new BigNumber(amount).shiftedBy(token.decimals),
       isGasSubsidized: isGasSubsidizedForNetwork(networkId),
       origin: 'earn-withdraw',
     }),

From c6502309659ea0d9f60fe7d8e074884edbcdd2eb Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 13:12:51 -0700
Subject: [PATCH 079/118] test(earn): mock usePrepareTransactions from hooks

---
 src/earn/EarnConfirmationScreen.test.tsx | 101 ++++++++++++++++-------
 src/earn/EarnEnterAmount.test.tsx        |  13 ++-
 2 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index ee1d64379d7..67c3515abf0 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -5,7 +5,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnConfirmationScreen from 'src/earn/EarnConfirmationScreen'
-import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
+import { usePrepareTransactions } from 'src/earn/hooks'
 import { withdrawStart } from 'src/earn/slice'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { navigate } from 'src/navigator/NavigationService'
@@ -16,11 +16,10 @@ import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
+import { createMockStore } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
   mockAaveArbUsdcTokenId,
-  mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
   mockArbUsdcTokenId,
@@ -57,7 +56,7 @@ jest.mock('src/earn/utils', () => ({
   ...(jest.requireActual('src/earn/utils') as any),
   isGasSubsidizedForNetwork: jest.fn(),
 }))
-jest.mock('src/earn/prepareTransactions')
+jest.mock('src/earn/hooks')
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
   type: 'possible' as const,
@@ -90,10 +89,16 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
 }
 
 describe('EarnConfirmationScreen', () => {
+  const refreshPreparedTransactionsSpy = jest.fn()
   beforeEach(() => {
     jest.clearAllMocks()
-
-    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue(mockPreparedTransaction)
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: undefined,
+      refreshPreparedTransactions: refreshPreparedTransactionsSpy,
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
+    })
     jest
       .mocked(getFeatureGate)
       .mockImplementation(
@@ -104,6 +109,15 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('renders total balance, rewards and gas after fetching rewards and preparing tx', async () => {
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: mockPreparedTransaction,
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
+    })
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -124,8 +138,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
       '₱15.73'
     )
-    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
-    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     expect(getByText('earnFlow.collect.plus')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
@@ -142,18 +154,20 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
-    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
-      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
-      pool: { ...mockEarnPositions[0], balance: '10.75' },
-      rewardsPositions: [mockRewardsPositions[1]],
-      walletAddress: mockAccount.toLowerCase(),
-      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
-      amount: '10.75',
-    })
     expect(store.getActions()).toEqual([])
   })
 
   it('skips rewards section when no rewards', async () => {
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: mockPreparedTransaction,
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
+    })
+
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider
         store={createMockStore({
@@ -185,7 +199,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
       '₱15.73'
     )
-    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
     expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
@@ -199,9 +212,14 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('shows error and keeps cta disabled if prepare tx fails', async () => {
-    jest
-      .mocked(prepareWithdrawAndClaimTransactions)
-      .mockRejectedValue(new Error('Failed to prepare'))
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: undefined,
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: new Error('Failed to prepare'),
+      isPreparingTransactions: false,
+    })
+
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -216,7 +234,6 @@ describe('EarnConfirmationScreen', () => {
 
     expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
@@ -228,10 +245,20 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('disables cta if not enough balance for gas', async () => {
-    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue({
-      type: 'not-enough-balance-for-gas',
-      feeCurrencies: [mockPreparedTransaction.feeCurrency],
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: {
+          ...mockPreparedTransaction,
+          type: 'not-enough-balance-for-gas',
+          feeCurrencies: [mockPreparedTransaction.feeCurrency],
+        },
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
     })
+
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -246,7 +273,6 @@ describe('EarnConfirmationScreen', () => {
 
     expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
-    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
@@ -257,6 +283,16 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('pressing cta dispatches withdraw action and fires analytics event', async () => {
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: mockPreparedTransaction,
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
+    })
+
     const { getByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -330,9 +366,18 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('navigate and fire analytics on no gas CTA press', async () => {
-    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue({
-      type: 'not-enough-balance-for-gas',
-      feeCurrencies: [mockPreparedTransaction.feeCurrency],
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: {
+          ...mockPreparedTransaction,
+          type: 'not-enough-balance-for-gas',
+          feeCurrencies: [mockPreparedTransaction.feeCurrency],
+        },
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
     })
 
     const { getByText, queryByTestId } = render(
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index f9b22a81fe5..e4fa3c25db5 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import { usePrepareTransactions } from 'src/earn/prepareTransactions'
+import { usePrepareTransactions } from 'src/earn/hooks'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -35,7 +35,7 @@ import {
   mockUSDCAddress,
 } from 'test/values'
 
-jest.mock('src/earn/prepareTransactions')
+jest.mock('src/earn/hooks')
 jest.mock('react-native-localize')
 jest.mock('src/statsig') // statsig isn't used directly but the hooksApiSelector uses it
 jest
@@ -217,7 +217,6 @@ describe('EarnEnterAmount', () => {
       jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
-          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -346,6 +345,7 @@ describe('EarnEnterAmount', () => {
       jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
+          // @ts-expect-error
           swapTransaction: mockSwapTransaction,
         },
         refreshPreparedTransactions: jest.fn(),
@@ -446,7 +446,6 @@ describe('EarnEnterAmount', () => {
       jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
-          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -501,7 +500,6 @@ describe('EarnEnterAmount', () => {
       jest.mocked(usePrepareTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
-          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -584,7 +582,6 @@ describe('EarnEnterAmount', () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
-        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -680,7 +677,6 @@ describe('EarnEnterAmount', () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransactionNotEnough,
-        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -717,7 +713,6 @@ describe('EarnEnterAmount', () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
-        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -742,6 +737,7 @@ describe('EarnEnterAmount', () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
+        // @ts-expect-error
         swapTransaction: mockSwapTransaction,
       },
       refreshPreparedTransactions: jest.fn(),
@@ -773,6 +769,7 @@ describe('EarnEnterAmount', () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
+        // @ts-expect-error
         swapTransaction: mockSwapTransaction,
       },
       refreshPreparedTransactions: jest.fn(),

From 3a4784fe0cb7417144784cf0a45879bb50391cea Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 14:35:25 -0700
Subject: [PATCH 080/118] fix(earn): claim reward should not display total
 deposit

---
 locales/base/translation.json            |  1 +
 src/earn/EarnConfirmationScreen.test.tsx |  4 ++--
 src/earn/EarnConfirmationScreen.tsx      | 14 ++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 19dfb78d913..e88da6f3a39 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2631,6 +2631,7 @@
       "titleWithdraw": "You’re going to withdraw:",
       "total": "TOTAL",
       "plus": "PLUS",
+      "reward": "REWARD",
       "rate": "Rate (est.)",
       "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 61fee38b28d..c5b440bd7b5 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -127,7 +127,7 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
-    expect(getByText('earnFlow.collect.plus')).toBeTruthy()
+    expect(getByText('earnFlow.collect.reward')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
       '0.01 ARB'
     )
@@ -187,7 +187,7 @@ describe('EarnConfirmationScreen', () => {
     )
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
-    expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
+    expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
     expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
     expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toBeFalsy()
     await waitFor(() => {
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 8e61116b5ac..8f6d24a2581 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -145,14 +145,16 @@ export default function EarnConfirmationScreen({ route }: Props) {
       <ScrollView contentContainerStyle={styles.contentContainer}>
         <Title mode={mode} />
         <View style={styles.collectInfoContainer}>
-          <CollectItem
-            title={t('earnFlow.collect.total')}
-            tokenInfo={depositToken}
-            rewardAmount={withdrawAmountInDepositToken}
-          />
+          {mode !== 'Claim' && (
+            <CollectItem
+              title={t('earnFlow.collect.total')}
+              tokenInfo={depositToken}
+              rewardAmount={withdrawAmountInDepositToken}
+            />
+          )}
           {rewardsTokens.map((token, index) => (
             <CollectItem
-              title={t('earnFlow.collect.plus')}
+              title={t('earnFlow.collect.reward')}
               key={index}
               tokenInfo={token}
               rewardAmount={token.balance}

From 4e205caa242a5421000c24a28cec3578861257e3 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 14:43:51 -0700
Subject: [PATCH 081/118] style(earn): always make withdrawAmountInDepositToken
 a BigNumber

---
 src/earn/EarnConfirmationScreen.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 8f6d24a2581..8550953ebeb 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -70,7 +70,10 @@ export default function EarnConfirmationScreen({ route }: Props) {
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
 
   const withdrawAmountInDepositToken = useMemo(
-    () => inputAmount ?? getEarnPositionBalanceValues({ pool }).poolBalanceInDepositToken,
+    () =>
+      inputAmount
+        ? new BigNumber(inputAmount)
+        : getEarnPositionBalanceValues({ pool }).poolBalanceInDepositToken,
     [withdrawToken, pool.pricePerShare, inputAmount]
   )
 
@@ -79,7 +82,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     loading: isPreparingTransactions,
     error: prepareTransactionError,
   } = usePrepareWithdrawAndClaimTransactions({
-    amount: new BigNumber(withdrawAmountInDepositToken).dividedBy(pool.pricePerShare[0]).toString(),
+    amount: withdrawAmountInDepositToken.dividedBy(pool.pricePerShare[0]).toString(),
     pool,
     walletAddress,
     feeCurrencies,

From 3958cef0fb948d09e9617883383d7d86b6e8e805 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 15:06:14 -0700
Subject: [PATCH 082/118] test(earn): partial withdrawals display and trigger
 correctly

---
 src/earn/EarnConfirmationScreen.test.tsx | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index c5b440bd7b5..58afc503617 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -153,6 +153,57 @@ describe('EarnConfirmationScreen', () => {
     expect(store.getActions()).toEqual([])
   })
 
+  it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
+    const { getByText, getByTestId, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnConfirmationScreen}
+          params={{
+            pool: { ...mockEarnPositions[0], balance: '10.75' },
+            mode: 'PartialWithdraw',
+            inputAmount: (10.75 * +mockEarnPositions[0].pricePerShare) / 2, // Input amount is half of the balance
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
+      '5.91 USDC'
+    )
+    expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
+      '₱7.86'
+    )
+    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
+
+    expect(getByText('earnFlow.collect.reward')).toBeTruthy()
+    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
+      '0.01 ARB'
+    )
+    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent(
+      '₱0.016'
+    )
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
+    })
+    expect(getByTestId('EarnConfirmation/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
+    expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
+    expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      rewardsPositions: [mockRewardsPositions[1]],
+      walletAddress: mockAccount.toLowerCase(),
+      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
+      amount: '5.37500000000000045455',
+    })
+    expect(store.getActions()).toEqual([])
+  })
+
   it('skips rewards section when no rewards', async () => {
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider

From c0f422d88f4a2085546b40ba7841de44c9097db6 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 16:02:39 -0700
Subject: [PATCH 083/118] fix(earn-saga): set amount in analytics

---
 src/earn/saga.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index e5b82b712eb..baeb4c234bb 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -327,7 +327,7 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
     depositTokenId: tokenId,
     networkId,
     poolId: pool.positionId,
-    tokenAmount: pool.balance,
+    tokenAmount: amount ?? pool.balance,
     providerId: pool.appId,
     rewards: rewardsTokens.map(({ tokenId, balance }) => ({
       tokenId,

From 1e6f5917615c466ba3a9ea63bcf3bcb26a8bff91 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 16:03:37 -0700
Subject: [PATCH 084/118] test(earn-saga): withdraw and claim when amount is
 set

---
 src/earn/saga.test.ts | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 0b06131cacb..777c4c14600 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -808,6 +808,45 @@ describe('withdrawSubmitSaga', () => {
     expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(true)
   })
 
+  it('sends withdraw and claim transactions, navigates home and dispatches the success action (amount set & gas subsidy off)', async () => {
+    await expectSaga(withdrawSubmitSaga, {
+      type: withdrawStart.type,
+      payload: {
+        pool: mockPool,
+        preparedTransactions: [serializableWithdrawTx, serializableClaimRewardTx],
+        rewardsTokens: mockRewardsPositions[1].tokens,
+        amount: '5',
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide(sagaProviders)
+      .put(withdrawSuccess())
+      .put(fetchTokenBalances({ showLoading: false }))
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
+      .run()
+
+    expect(navigateHome).toHaveBeenCalled()
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(2)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, {
+      ...expectedWithdrawStandbyTx,
+      inAmount: { ...expectedWithdrawStandbyTx.inAmount, value: '5' },
+      outAmount: { ...expectedWithdrawStandbyTx.outAmount, value: '5' },
+    })
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(2, expectedClaimRewardTx)
+    expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_withdraw_submit_start, {
+      ...expectedAnalyticsPropsWithRewards,
+      tokenAmount: '5',
+    })
+    expect(AppAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_withdraw_submit_success, {
+      ...expectedAnalyticsPropsWithRewards,
+      tokenAmount: '5',
+    })
+    expect(mockIsGasSubsidizedCheck).toHaveBeenCalledWith(false)
+    expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(true)
+  })
+
   it('sends only withdraw if there are no rewards (gas subsidy on)', async () => {
     jest.mocked(isGasSubsidizedForNetwork).mockReturnValue(true)
     await expectSaga(withdrawSubmitSaga, {

From 79d72d4690e4df93b8056f3f6769465a51500d10 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 16:26:15 -0700
Subject: [PATCH 085/118] fix(earn): mode for confirmation screen render

---
 src/earn/EarnConfirmationScreen.test.tsx | 2 +-
 src/earn/EarnConfirmationScreen.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 68078fcb5fa..793a777175f 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -160,7 +160,7 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'PartialWithdraw',
+            mode: 'withdraw',
             inputAmount: (10.75 * +mockEarnPositions[0].pricePerShare) / 2, // Input amount is half of the balance
           }}
         />
diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 9d1e737abc7..deeedfac384 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -149,7 +149,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
       <ScrollView contentContainerStyle={styles.contentContainer}>
         <Title mode={mode} />
         <View style={styles.collectInfoContainer}>
-          {mode !== 'Claim' && (
+          {mode !== 'claim-rewards' && (
             <CollectItem
               title={t('earnFlow.collect.total')}
               tokenInfo={depositToken}

From d3a7950bf59c9f71e8eac3b30ee8b96eeaea490e Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 20:52:09 -0700
Subject: [PATCH 086/118] fix(earn): use withdraw amount in deposit token in
 debounced transaction

---
 src/earn/EarnConfirmationScreen.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index b69c8124a93..62a4ab7cbc7 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -100,7 +100,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     }
 
     return refreshPreparedTransactions({
-      amount: new BigNumber(amount).dividedBy(pool.pricePerShare[0]).toString(),
+      amount: amount.toString(),
       token,
       walletAddress,
       feeCurrencies,
@@ -116,7 +116,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
 
     const debouncedRefreshTransactions = setTimeout(() => {
       return handleRefreshPreparedTransactions(
-        new BigNumber(withdrawAmountInDepositToken),
+        withdrawAmountInDepositToken,
         withdrawToken,
         feeCurrencies
       )

From 7181e44f7c76c2dc0592de962c61a2986eef0f58 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 28 Oct 2024 20:53:06 -0700
Subject: [PATCH 087/118] test(earn): mock usePrepareTransactions

---
 src/earn/EarnConfirmationScreen.test.tsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 117ca0c983c..6ad74f05618 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -158,6 +158,16 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
+    jest.mocked(usePrepareTransactions).mockReturnValue({
+      prepareTransactionsResult: {
+        prepareTransactionsResult: mockPreparedTransaction,
+      },
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: false,
+    })
+
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -179,8 +189,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
       '₱7.86'
     )
-    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
-    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     expect(getByText('earnFlow.collect.reward')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
@@ -197,14 +205,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
-    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
-      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
-      pool: { ...mockEarnPositions[0], balance: '10.75' },
-      rewardsPositions: [mockRewardsPositions[1]],
-      walletAddress: mockAccount.toLowerCase(),
-      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
-      amount: '5.37500000000000045455',
-    })
     expect(store.getActions()).toEqual([])
   })
 

From 7c0d8750b4fe1f76c2b9cce3f0e728b5440edb5b Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 12:04:29 -0700
Subject: [PATCH 088/118] fix(earn-confirmation): exclude rewards in partial
 withdrawals

---
 src/earn/EarnConfirmationScreen.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 8550953ebeb..7f60b076f6c 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -155,14 +155,15 @@ export default function EarnConfirmationScreen({ route }: Props) {
               rewardAmount={withdrawAmountInDepositToken}
             />
           )}
-          {rewardsTokens.map((token, index) => (
-            <CollectItem
-              title={t('earnFlow.collect.reward')}
-              key={index}
-              tokenInfo={token}
-              rewardAmount={token.balance}
-            />
-          ))}
+          {(mode !== 'PartialWithdraw' || pool.dataProps.withdrawalIncludesClaim) &&
+            rewardsTokens.map((token, index) => (
+              <CollectItem
+                title={t('earnFlow.collect.reward')}
+                key={index}
+                tokenInfo={token}
+                rewardAmount={token.balance}
+              />
+            ))}
           <View style={styles.separator} />
           <View>
             <Text style={styles.rateText}>{t('earnFlow.collect.fee')}</Text>

From b2d24bd521c22266c508e812ada8761392b0160f Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 12:06:13 -0700
Subject: [PATCH 089/118] test(earn-confirmation): exclude rewards from partial
 withdrawals

---
 src/earn/EarnConfirmationScreen.test.tsx | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 58afc503617..4ae6144a4c9 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -103,20 +103,20 @@ describe('EarnConfirmationScreen', () => {
     store.clearActions()
   })
 
-  it('renders total balance, rewards and gas after fetching rewards and preparing tx', async () => {
+  it('renders total balance, rewards and gas after fetching rewards and preparing tx for exit', async () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'PartialWithdraw',
+            mode: 'Exit',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleCollect')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
       '11.83 USDC'
@@ -153,8 +153,8 @@ describe('EarnConfirmationScreen', () => {
     expect(store.getActions()).toEqual([])
   })
 
-  it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
-    const { getByText, getByTestId, queryByTestId } = render(
+  it('renders total balance and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
+    const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider store={store}>
         <MockedNavigator
           component={EarnConfirmationScreen}
@@ -178,13 +178,7 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
-    expect(getByText('earnFlow.collect.reward')).toBeTruthy()
-    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
-      '0.01 ARB'
-    )
-    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent(
-      '₱0.016'
-    )
+    expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
 
     await waitFor(() => {
       expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
@@ -193,6 +187,7 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    // TODO(act-1389): update this test to make sure that reward positions are not included in partial withdrawals.
     expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
       feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
       pool: { ...mockEarnPositions[0], balance: '10.75' },

From 95be3a5bff8c1c78489d34d0e49fd1235be326f4 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 12:57:51 -0700
Subject: [PATCH 090/118] fix(earn-confirmation): mode type use in comparison
 for render

---
 src/earn/EarnConfirmationScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index a8a1611688c..004223bcabb 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -156,7 +156,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
               rewardAmount={withdrawAmountInDepositToken}
             />
           )}
-          {(mode !== 'PartialWithdraw' || pool.dataProps.withdrawalIncludesClaim) &&
+          {(mode !== 'withdraw' || pool.dataProps.withdrawalIncludesClaim) &&
             rewardsTokens.map((token, index) => (
               <CollectItem
                 title={t('earnFlow.collect.reward')}

From 7a2444d94612228d465f72215015b83ff8ca14e4 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 15:31:53 -0700
Subject: [PATCH 091/118] test(earn-confirmation): test exit and withdraw flows

---
 src/earn/EarnConfirmationScreen.test.tsx | 106 +++++++++++------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 6ad74f05618..bde68a958ad 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -15,11 +15,13 @@ import { StatsigFeatureGates } from 'src/statsig/types'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
+import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore } from 'test/utils'
+import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
   mockAaveArbUsdcTokenId,
+  mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
   mockArbUsdcTokenId,
@@ -57,6 +59,11 @@ jest.mock('src/earn/utils', () => ({
   isGasSubsidizedForNetwork: jest.fn(),
 }))
 jest.mock('src/earn/hooks')
+jest.mock('src/earn/prepareTransactions', () => ({
+  ...jest.requireActual('src/earn/prepareTransactions'),
+  prepareWithdrawAndClaimTransactions: jest.fn(),
+  prepareWithdrawTransactions: jest.fn(),
+}))
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
   type: 'possible' as const,
@@ -92,45 +99,38 @@ describe('EarnConfirmationScreen', () => {
   const refreshPreparedTransactionsSpy = jest.fn()
   beforeEach(() => {
     jest.clearAllMocks()
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: undefined,
-      refreshPreparedTransactions: refreshPreparedTransactionsSpy,
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
-    })
     jest
       .mocked(getFeatureGate)
       .mockImplementation(
         (gateName: StatsigFeatureGates) => gateName === StatsigFeatureGates.SHOW_POSITIONS
       )
     jest.mocked(isGasSubsidizedForNetwork).mockReturnValue(false)
-    store.clearActions()
-  })
-
-  it('renders total balance, rewards and gas after fetching rewards and preparing tx', async () => {
     jest.mocked(usePrepareTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
       },
-      refreshPreparedTransactions: jest.fn(),
+      refreshPreparedTransactions: refreshPreparedTransactionsSpy,
       clearPreparedTransactions: jest.fn(),
       prepareTransactionError: undefined,
       isPreparingTransactions: false,
     })
+    store.clearActions()
+  })
+
+  it('renders total balance, rewards and gas after fetching rewards and preparing tx', async () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'withdraw',
+            mode: 'Exit',
           }}
         />
       </Provider>
     )
 
-    expect(getByText('earnFlow.collect.titleWithdraw')).toBeTruthy()
+    expect(getByText('earnFlow.collect.titleCollect')).toBeTruthy()
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
       '11.83 USDC'
@@ -150,25 +150,35 @@ describe('EarnConfirmationScreen', () => {
     await waitFor(() => {
       expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
     })
+
     expect(getByTestId('EarnConfirmation/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(usePrepareTransactions).toHaveBeenCalledWith('Exit', {
+      rewardsPositions: [mockRewardsPositions[1]],
+    })
+    await waitFor(() => expect(refreshPreparedTransactionsSpy).toHaveBeenCalledTimes(1))
+    expect(refreshPreparedTransactionsSpy).toHaveBeenCalledWith({
+      shortcutId: 'Exit',
+      token: {
+        ...mockStoreTokens?.tokenBalances[mockAaveArbUsdcTokenId],
+        priceUsd: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].priceUsd!),
+        balance: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].balance!),
+        lastKnownPriceUsd: new BigNumber('1'),
+      },
+      amount: '11.825',
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      hooksApiUrl: networkConfig.hooksApiUrl,
+      walletAddress: mockAccount.toLowerCase(),
+      useMax: undefined,
+    })
     expect(store.getActions()).toEqual([])
   })
 
   it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: mockPreparedTransaction,
-      },
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
-    })
-
-    const { getByText, getByTestId, queryByTestId } = render(
+    const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider store={store}>
         <MockedNavigator
           component={EarnConfirmationScreen}
@@ -190,13 +200,7 @@ describe('EarnConfirmationScreen', () => {
       '₱7.86'
     )
 
-    expect(getByText('earnFlow.collect.reward')).toBeTruthy()
-    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
-      '0.01 ARB'
-    )
-    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent(
-      '₱0.016'
-    )
+    expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
 
     await waitFor(() => {
       expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
@@ -205,20 +209,26 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    await waitFor(() => expect(refreshPreparedTransactionsSpy).toHaveBeenCalledTimes(1))
+    expect(refreshPreparedTransactionsSpy).toHaveBeenCalledWith({
+      shortcutId: 'withdraw',
+      token: {
+        ...mockStoreTokens?.tokenBalances[mockAaveArbUsdcTokenId],
+        priceUsd: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].priceUsd!),
+        balance: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].balance!),
+        lastKnownPriceUsd: new BigNumber('1'),
+      },
+      amount: '5.9125000000000005',
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      hooksApiUrl: networkConfig.hooksApiUrl,
+      walletAddress: mockAccount.toLowerCase(),
+      useMax: undefined,
+    })
     expect(store.getActions()).toEqual([])
   })
 
   it('skips rewards section when no rewards', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: mockPreparedTransaction,
-      },
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
-    })
-
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider
         store={createMockStore({
@@ -334,16 +344,6 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('pressing cta dispatches withdraw action and fires analytics event', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: mockPreparedTransaction,
-      },
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
-    })
-
     const { getByTestId } = render(
       <Provider store={store}>
         <MockedNavigator

From 7bdd90f88ddf77e9be2d42b942472713ab021bfb Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 16:02:40 -0700
Subject: [PATCH 092/118] test(earn): prepareClaimTransactions

---
 src/earn/prepareTransactions.test.ts | 104 +++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 56b117cf43b..1c9394deb88 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js'
 import {
+  prepareClaimTransactions,
   prepareDepositTransactions,
   prepareWithdrawAndClaimTransactions,
   prepareWithdrawTransactions,
@@ -456,4 +457,107 @@ describe('prepareTransactions', () => {
       })
     })
   })
+
+  describe('prepareClaimTransactions', () => {
+    it('prepares claim transactions using claim-rewards shortcut', async () => {
+      jest.mocked(triggerShortcutRequest).mockResolvedValue({
+        transactions: [
+          {
+            from: '0x1234',
+            to: '0x5678',
+            data: '0xencodedData',
+            gas: '50100',
+            estimatedGasUse: '49800',
+          },
+        ],
+      })
+
+      const result = await prepareClaimTransactions({
+        pool: mockEarnPositions[0],
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        hooksApiUrl: 'https://hooks.api',
+        rewardsPositions: [mockRewardsPositions[0]],
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x1234',
+          to: '0x5678',
+          data: '0xencodedData',
+          gas: BigInt(50100),
+          _estimatedGasUse: BigInt(49800),
+        },
+      ]
+
+      expect(result).toEqual({
+        prepareTransactionsResult: {
+          type: 'possible',
+          feeCurrency: mockFeeCurrency,
+          transactions: expectedTransactions,
+        },
+      })
+
+      expect(prepareTransactions).toHaveBeenCalledWith({
+        baseTransactions: expectedTransactions,
+        feeCurrencies: [mockFeeCurrency],
+        isGasSubsidized: false,
+        origin: 'earn-claim-rewards',
+      })
+
+      expect(triggerShortcutRequest).toHaveBeenCalledWith('https://hooks.api', {
+        address: '0x1234',
+        appId: mockEarnPositions[0].appId,
+        networkId: mockEarnPositions[0].networkId,
+        shortcutId: 'claim-rewards',
+      })
+    })
+
+    it('prepares claim transactions using claim-rewards shortcut with multiple rewards', async () => {
+      jest.mocked(triggerShortcutRequest).mockResolvedValue({
+        transactions: [
+          {
+            from: '0x1234',
+            to: '0x5678',
+            data: '0xencodedData',
+            gas: '50100',
+            estimatedGasUse: '49800',
+          },
+        ],
+      })
+
+      const result = await prepareClaimTransactions({
+        pool: mockEarnPositions[0],
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        hooksApiUrl: 'https://hooks.api',
+        rewardsPositions: mockRewardsPositions,
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x1234',
+          to: '0x5678',
+          data: '0xencodedData',
+          gas: BigInt(50100),
+          _estimatedGasUse: BigInt(49800),
+        },
+        {
+          from: '0x1234',
+          to: '0x5678',
+          data: '0xencodedData',
+          gas: BigInt(50100),
+          _estimatedGasUse: BigInt(49800),
+        },
+      ]
+
+      expect(result).toEqual({
+        prepareTransactionsResult: {
+          type: 'possible',
+          feeCurrency: mockFeeCurrency,
+          transactions: expectedTransactions,
+        },
+      })
+    })
+  })
 })

From a89d17cdd742b9e2339f5369f4aa76883d411af0 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 29 Oct 2024 16:52:17 -0700
Subject: [PATCH 093/118] test(earn): add test stub for usePrepareTransactions
 earn hook

---
 src/earn/hooks.test.tsx | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/earn/hooks.test.tsx

diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
new file mode 100644
index 00000000000..c6d41a1c249
--- /dev/null
+++ b/src/earn/hooks.test.tsx
@@ -0,0 +1,68 @@
+import { renderHook } from '@testing-library/react-native'
+import { usePrepareTransactions } from 'src/earn/hooks'
+import { mockRewardsPositions } from 'test/values'
+
+describe('usePrepareTransactions', () => {
+  it.each([
+    {
+      mode: 'withdraw',
+      title: 'calls correct transaction preparation for withdraw',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'claim-rewards',
+      title: 'calls correct transaction preparation for claim-rewards',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'claim-rewards',
+      extraArgs: { rewardsPositions: mockRewardsPositions },
+      title: 'calls correct transaction preparation for claim-rewards with rewardsPositions',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'deposit',
+      title: 'calls correct transaction preparation for deposit',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'swap-deposit',
+      title: 'calls correct transaction preparation for swap-deposit',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'exit',
+      title: 'calls correct transaction preparation for exit',
+      expectedPrepareTransactionsResult: undefined,
+    },
+    {
+      mode: 'exit',
+      extraArgs: { rewardsPositions: mockRewardsPositions },
+      title: 'calls correct transaction preparation for exit with rewardsPositions',
+      expectedPrepareTransactionsResult: undefined,
+    },
+  ] as const)('$title', async ({ mode, extraArgs, expectedPrepareTransactionsResult }) => {
+    // const pool = mockEarnPositions[0] as EarnPosition
+    const { result } = renderHook(() => usePrepareTransactions(mode, extraArgs))
+
+    // TODO(tomm): setup mocks and call refreshPreparedTransactions to simulate preparing a transaction
+    // const args = {
+    //   pool,
+    //   hooksApiUrl: networkConfig.hooksApiUrl,
+    //   tokenId: pool.dataProps.depositTokenId,
+    // }
+
+    // await act(async () => {
+    //   await result.current.refreshPreparedTransactions(args)
+    // })
+
+    // Validate the initial state and functions returned by the hook
+    expect(result.current).toEqual({
+      prepareTransactionsResult: expectedPrepareTransactionsResult,
+      isPreparingTransactions: false,
+      prepareTransactionError: undefined,
+      refreshPreparedTransactions: expect.any(Function),
+      clearPreparedTransactions: expect.any(Function),
+    })
+  })
+})

From 7d81bd27e7d6e98af1aad8966eb4202053a1be79 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 30 Oct 2024 14:35:12 -0700
Subject: [PATCH 094/118] fix(earn): exclude claim tx when
 withdrawalIncludesClaim is true

---
 src/earn/prepareTransactions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index a1c1334f29a..0d45192c5f8 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -146,7 +146,7 @@ export async function prepareWithdrawAndClaimTransactions({
       feeCurrencies,
       baseTransactions: rawShortcutTransactionsToTransactionRequests([
         ...withdrawTransactions,
-        ...claimTransactions.flat(),
+        ...(dataProps.withdrawalIncludesClaim ? [] : claimTransactions.flat()),
       ]),
       isGasSubsidized: isGasSubsidizedForNetwork(networkId),
       origin: 'earn-withdraw',

From 40d5d309ee5072b2afc9dc67f8c8508bb7a9ac6f Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 30 Oct 2024 14:39:12 -0700
Subject: [PATCH 095/118] test(earn): usePrepareTransactions hook

---
 src/earn/hooks.test.tsx | 438 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 404 insertions(+), 34 deletions(-)

diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
index c6d41a1c249..53529c5086c 100644
--- a/src/earn/hooks.test.tsx
+++ b/src/earn/hooks.test.tsx
@@ -1,68 +1,438 @@
-import { renderHook } from '@testing-library/react-native'
+import { act, renderHook } from '@testing-library/react-native'
+import BigNumber from 'bignumber.js'
+import { FetchMock } from 'jest-fetch-mock/types'
+import React from 'react'
+import { Provider } from 'react-redux'
 import { usePrepareTransactions } from 'src/earn/hooks'
-import { mockRewardsPositions } from 'test/values'
+import { RawShortcutTransaction } from 'src/positions/slice'
+import { Position, ShortcutStatus } from 'src/positions/types'
+import { TokenBalance } from 'src/tokens/slice'
+import { NetworkId } from 'src/transactions/types'
+import { prepareTransactions } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
+import { createMockStore } from 'test/utils'
+import {
+  mockAaveArbUsdcAddress,
+  mockAccount,
+  mockArbArbAddress,
+  mockArbEthTokenId,
+  mockArbUsdcTokenId,
+  mockEarnPositions,
+  mockPositions,
+  mockRewardsPositions,
+  mockShortcuts,
+  mockTokenBalances,
+} from 'test/values'
+import { parseGwei } from 'viem'
+
+const mockFetch = fetch as FetchMock
+const gas = BigInt(100_000)
+const maxFeePerGas = parseGwei('5')
+const _baseFeePerGas = parseGwei('1')
+const transactions = [
+  {
+    from: '0x2b8441ef13333ffa955c9ea5ab5b3692da95260d',
+    networkId: NetworkId['celo-alfajores'],
+    data: '0x3d18b912',
+    to: '0xda7f463c27ec862cfbf2369f3f74c364d050d93f',
+  } as const,
+]
+const rewardId = 'claim-reward-0xda7f463c27ec862cfbf2369f3f74c364d050d93f-0.010209368244703615'
+
+jest.mock('src/viem/prepareTransactions')
+
+function getMockStoreWithShortcutStatus(
+  status: ShortcutStatus,
+  transactions: RawShortcutTransaction[]
+) {
+  return createMockStore({
+    positions: {
+      positions: mockPositions,
+      shortcuts: mockShortcuts,
+      triggeredShortcutsStatus: {
+        [rewardId]: {
+          status,
+          transactions,
+          appName: 'some app name',
+          appImage: 'https://some.app/image.png',
+        },
+      },
+    },
+  })
+}
+
+const mockFeeCurrencies: TokenBalance[] = [
+  {
+    ...mockTokenBalances[mockArbEthTokenId],
+    isNative: true,
+    balance: new BigNumber(1),
+    priceUsd: new BigNumber(1500),
+    lastKnownPriceUsd: new BigNumber(1500),
+  },
+]
+
+const mockRefreshArgs = {
+  pool: mockEarnPositions[0],
+  hooksApiUrl: networkConfig.hooksApiUrl,
+}
+
+const mockResponseBody = {
+  message: 'OK',
+  data: {
+    transactions: [
+      {
+        networkId: NetworkId['arbitrum-sepolia'],
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+      },
+    ],
+  },
+}
+
+const mockSwapDepositResponseBody = {
+  message: 'OK',
+  data: {
+    transactions: [
+      {
+        networkId: NetworkId['arbitrum-sepolia'],
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+      },
+      {
+        networkId: NetworkId['arbitrum-sepolia'],
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        value: '0',
+        gas: '2788000',
+        estimatedGasUse: '892551',
+      },
+    ],
+    dataProps: {
+      swapTransaction: {
+        chainId: 44787,
+        buyAmount: '994820',
+        sellAmount: '1785876928077378476',
+        buyTokenAddress: mockArbArbAddress,
+        sellTokenAddress: mockAaveArbUsdcAddress,
+        price: '0.557',
+        guaranteedPrice: '0.55',
+        estimatedPriceImpact: '0.0',
+        gas: '1800000',
+        gasPrice: '10000000',
+        to: '0x0000000000000000000000000000000000000123',
+        value: '0',
+        data: '0x0',
+        from: mockAccount,
+        allowanceTarget: '0x0000000000000000000000000000000000000123',
+        estimatedGasUse: '971972',
+        swapType: 'same-chain',
+        appFeePercentageIncludedInPrice: '0.6',
+        simulationStatus: 'success',
+      },
+    },
+  },
+}
+
+const expectedPrepareTransactionsResult = {
+  prepareTransactionsResult: {
+    type: 'possible',
+    transactions: [
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+    ],
+    feeCurrency: mockFeeCurrencies[0],
+  },
+}
+
+const expectedClaimTransactionResult = {
+  prepareTransactionsResult: {
+    type: 'possible',
+    transactions: [
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+    ],
+    feeCurrency: mockFeeCurrencies[0],
+  },
+}
+
+const expectedExitTransactionResult = {
+  prepareTransactionsResult: {
+    type: 'possible',
+    transactions: [
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+      {
+        from: '0xfrom',
+        to: '0xto',
+        data: '0xdata',
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      },
+    ],
+    feeCurrency: mockFeeCurrencies[0],
+  },
+}
+
+const expectedSwapDepositPrepareTransactionsResult = {
+  prepareTransactionsResult: {
+    feeCurrency: mockFeeCurrencies[0],
+    transactions: [
+      {
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+        _estimatedGasUse: undefined,
+        data: '0xdata',
+        from: '0xfrom',
+        to: '0xto',
+        value: undefined,
+      },
+      {
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+        _estimatedGasUse: BigInt(892551),
+        data: '0xdata',
+        from: '0xfrom',
+        to: '0xto',
+        value: BigInt(0),
+      },
+    ],
+    type: 'possible',
+  },
+  swapTransaction: {
+    allowanceTarget: '0x0000000000000000000000000000000000000123',
+    appFeePercentageIncludedInPrice: '0.6',
+    buyAmount: '994820',
+    buyTokenAddress: mockArbArbAddress,
+    chainId: 44787,
+    data: '0x0',
+    estimatedGasUse: '971972',
+    estimatedPriceImpact: '0.0',
+    from: mockAccount,
+    gas: '1800000',
+    gasPrice: '10000000',
+    guaranteedPrice: '0.55',
+    price: '0.557',
+    sellAmount: '1785876928077378476',
+    sellTokenAddress: mockAaveArbUsdcAddress,
+    simulationStatus: 'success',
+    swapType: 'same-chain',
+    to: '0x0000000000000000000000000000000000000123',
+    value: '0',
+  },
+}
 
 describe('usePrepareTransactions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.mocked(prepareTransactions).mockImplementation(async ({ baseTransactions }) => ({
+      transactions: baseTransactions.map((tx) => ({
+        ...tx,
+        gas,
+        maxFeePerGas,
+        _baseFeePerGas,
+      })),
+      type: 'possible' as const,
+      feeCurrency: mockFeeCurrencies[0],
+    }))
+  })
+
   it.each([
     {
       mode: 'withdraw',
       title: 'calls correct transaction preparation for withdraw',
-      expectedPrepareTransactionsResult: undefined,
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: expectedPrepareTransactionsResult,
+      mockRefreshArgs: mockRefreshArgs,
     },
     {
-      mode: 'claim-rewards',
-      title: 'calls correct transaction preparation for claim-rewards',
-      expectedPrepareTransactionsResult: undefined,
+      mode: 'withdraw',
+      title: 'calls correct transaction preparation for partial withdraw',
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: expectedPrepareTransactionsResult,
+      mockRefreshArgs: mockRefreshArgs,
     },
     {
       mode: 'claim-rewards',
       extraArgs: { rewardsPositions: mockRewardsPositions },
       title: 'calls correct transaction preparation for claim-rewards with rewardsPositions',
-      expectedPrepareTransactionsResult: undefined,
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: expectedClaimTransactionResult,
+      mockRefreshArgs: mockRefreshArgs,
+    },
+    {
+      mode: 'claim-rewards',
+      extraArgs: { rewardsPositions: [] as Position[] },
+      title: 'calls correct transaction preparation for claim-rewards with no rewardsPositions',
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: {
+        ...expectedClaimTransactionResult,
+        prepareTransactionsResult: {
+          ...expectedClaimTransactionResult.prepareTransactionsResult,
+          transactions: [],
+        },
+      },
+      mockRefreshArgs: mockRefreshArgs,
     },
     {
       mode: 'deposit',
       title: 'calls correct transaction preparation for deposit',
-      expectedPrepareTransactionsResult: undefined,
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: expectedPrepareTransactionsResult,
+      mockRefreshArgs: {
+        ...mockRefreshArgs,
+        token: mockTokenBalances[mockArbUsdcTokenId],
+      },
     },
     {
       mode: 'swap-deposit',
       title: 'calls correct transaction preparation for swap-deposit',
-      expectedPrepareTransactionsResult: undefined,
+      mockResponseBody: mockSwapDepositResponseBody,
+      expectedPrepareTransactionsResult: expectedSwapDepositPrepareTransactionsResult,
+      mockRefreshArgs: {
+        ...mockRefreshArgs,
+        token: mockTokenBalances[mockArbUsdcTokenId],
+      },
     },
     {
       mode: 'exit',
+      extraArgs: { rewardsPositions: mockRewardsPositions },
       title: 'calls correct transaction preparation for exit',
-      expectedPrepareTransactionsResult: undefined,
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: expectedExitTransactionResult,
+      mockRefreshArgs: mockRefreshArgs,
     },
     {
       mode: 'exit',
       extraArgs: { rewardsPositions: mockRewardsPositions },
-      title: 'calls correct transaction preparation for exit with rewardsPositions',
-      expectedPrepareTransactionsResult: undefined,
+      title: 'calls correct transaction preparation for exit when withdrawalIncludesClaim is true',
+      mockResponseBody: mockResponseBody,
+      expectedPrepareTransactionsResult: {
+        ...expectedExitTransactionResult,
+        prepareTransactionsResult: {
+          ...expectedExitTransactionResult.prepareTransactionsResult,
+          transactions: [expectedExitTransactionResult.prepareTransactionsResult.transactions[0]],
+        },
+      },
+      mockRefreshArgs: {
+        ...mockRefreshArgs,
+        pool: {
+          ...mockEarnPositions[0],
+          dataProps: { ...mockEarnPositions[0].dataProps, withdrawalIncludesClaim: true },
+        },
+      },
     },
-  ] as const)('$title', async ({ mode, extraArgs, expectedPrepareTransactionsResult }) => {
-    // const pool = mockEarnPositions[0] as EarnPosition
-    const { result } = renderHook(() => usePrepareTransactions(mode, extraArgs))
-
-    // TODO(tomm): setup mocks and call refreshPreparedTransactions to simulate preparing a transaction
-    // const args = {
-    //   pool,
-    //   hooksApiUrl: networkConfig.hooksApiUrl,
-    //   tokenId: pool.dataProps.depositTokenId,
-    // }
-
-    // await act(async () => {
-    //   await result.current.refreshPreparedTransactions(args)
-    // })
-
-    // Validate the initial state and functions returned by the hook
-    expect(result.current).toEqual({
-      prepareTransactionsResult: expectedPrepareTransactionsResult,
-      isPreparingTransactions: false,
-      prepareTransactionError: undefined,
-      refreshPreparedTransactions: expect.any(Function),
-      clearPreparedTransactions: expect.any(Function),
+  ] as const)(
+    '$title',
+    async ({
+      mode,
+      extraArgs,
+      mockResponseBody,
+      expectedPrepareTransactionsResult,
+      mockRefreshArgs,
+    }) => {
+      const { result } = renderHook(() => usePrepareTransactions(mode, extraArgs), {
+        wrapper: (component) => (
+          <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
+            {component?.children ? component.children : component}
+          </Provider>
+        ),
+      })
+
+      mockFetch.mockResponse(JSON.stringify(mockResponseBody), {
+        status: 200,
+      })
+
+      await act(async () => {
+        await result.current.refreshPreparedTransactions(mockRefreshArgs)
+      })
+
+      // Validate the initial state and functions returned by the hook
+      expect(result.current).toEqual({
+        prepareTransactionsResult: expectedPrepareTransactionsResult,
+        isPreparingTransactions: false,
+        prepareTransactionError: undefined,
+        refreshPreparedTransactions: expect.any(Function),
+        clearPreparedTransactions: expect.any(Function),
+      })
+    }
+  )
+
+  it('errors when unable to trigger shortcut error response from hooks API', async () => {
+    const { result } = renderHook(() => usePrepareTransactions('withdraw'), {
+      wrapper: (component) => (
+        <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
+          {component?.children ? component.children : component}
+        </Provider>
+      ),
     })
+
+    mockFetch.mockResponse(JSON.stringify({}), {
+      status: 500,
+    })
+
+    await expect(result.current.refreshPreparedTransactions(mockRefreshArgs)).rejects.toEqual(
+      new Error('Unable to trigger shortcut: 500 Internal Server Error')
+    )
+
+    // TODO test that result.current.prepareTransactionError is set correctly
+    // expect(result.current.prepareTransactionError).toEqual(new Error('Unable to trigger shortcut: 500 Internal Server Error'))
+  })
+
+  it('errors when invalid mode is passed', async () => {
+    // @ts-expect-error intentionally passing invalid mode
+    const { result } = renderHook(() => usePrepareTransactions('invalid-mode'), {
+      wrapper: (component) => (
+        <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
+          {component?.children ? component.children : component}
+        </Provider>
+      ),
+    })
+
+    await expect(result.current.refreshPreparedTransactions(mockRefreshArgs)).rejects.toEqual(
+      new Error('Invalid mode: invalid-mode')
+    )
+
+    // TODO test that result.current.prepareTransactionError is set correctly
+    // expect(result.current.prepareTransactionError).toEqual(new Error('Invalid mode: invalid-mode'))
   })
 })

From ff2bd43cf3f9794d2b053f71d3ea04e459f2698f Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 11:04:05 -0700
Subject: [PATCH 096/118] style(earn): use extract for clarity and narrow
 WithdrawAction types

---
 src/earn/types.ts       | 2 +-
 src/navigator/types.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/earn/types.ts b/src/earn/types.ts
index 0c28277a67b..22432b5e385 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -67,7 +67,7 @@ export interface BeforeDepositAction {
 }
 
 export interface WithdrawAction {
-  name: EarnActiveMode
+  name: Extract<EarnActiveMode, 'withdraw' | 'claim-rewards' | 'exit'>
   title: string
   details: string
   iconComponent: React.MemoExoticComponent<({ color }: { color: Colors }) => JSX.Element>
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index f11c77671c0..181bc51faff 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -81,11 +81,11 @@ export type StackParamList = {
   [Screens.EarnInfoScreen]: undefined
   [Screens.EarnEnterAmount]: {
     pool: EarnPosition
-    mode?: Exclude<EarnActiveMode, 'claim-rewards' | 'exit'>
+    mode?: Extract<EarnActiveMode, 'deposit' | 'swap-deposit' | 'withdraw'>
   }
   [Screens.EarnConfirmationScreen]: {
     pool: EarnPosition
-    mode: Exclude<EarnActiveMode, 'deposit' | 'swap-deposit'>
+    mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>
     inputAmount?: string
     useMax?: boolean
   }

From b57e331691cd54b78aa669461cec8db3a4f062a7 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 12:55:54 -0700
Subject: [PATCH 097/118] chore(earn): add logging for withdraw transactions
 preparation

---
 src/earn/prepareTransactions.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 0d45192c5f8..a77e9050923 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -170,9 +170,8 @@ export async function prepareWithdrawTransactions({
   useMax: boolean
 }) {
   const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
-  const { transactions }: { transactions: RawShortcutTransaction[] } = await triggerShortcutRequest(
-    hooksApiUrl,
-    {
+  const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
+    await triggerShortcutRequest(hooksApiUrl, {
       address: walletAddress,
       appId,
       networkId,
@@ -185,8 +184,11 @@ export async function prepareWithdrawTransactions({
         },
       ],
       ...shortcutTriggerArgs?.withdraw,
-    }
-  )
+    })
+  Logger.debug(TAG, 'prepareWithdrawTransactions', {
+    withdrawTransactions,
+    pool,
+  })
 
   return {
     prepareTransactionsResult: await prepareTransactions({

From 0de636827db8795e4bcb1e3b3da0781824600064 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 13:01:31 -0700
Subject: [PATCH 098/118] fix(earn): use correct name

---
 src/earn/prepareTransactions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index a77e9050923..cc6b8283bd8 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -193,7 +193,7 @@ export async function prepareWithdrawTransactions({
   return {
     prepareTransactionsResult: await prepareTransactions({
       feeCurrencies,
-      baseTransactions: rawShortcutTransactionsToTransactionRequests(transactions),
+      baseTransactions: rawShortcutTransactionsToTransactionRequests(withdrawTransactions),
       isGasSubsidized: isGasSubsidizedForNetwork(networkId),
       origin: 'earn-withdraw',
     }),

From 5b5087e7d2a74a203ad536b7d511c91f143d1b4d Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 23:02:34 -0700
Subject: [PATCH 099/118] refactor(earn): hooks and prepare transactions

---
 src/earn/EarnConfirmationScreen.tsx |  61 ++++------------
 src/earn/EarnEnterAmount.tsx        |   5 +-
 src/earn/hooks.ts                   |  56 ++++++++++-----
 src/earn/prepareTransactions.ts     | 108 ++++++++++++++++++++--------
 4 files changed, 130 insertions(+), 100 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 49c46a0ca03..8b7039aed80 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -1,6 +1,6 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import BigNumber from 'bignumber.js'
-import React, { useEffect, useMemo } from 'react'
+import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { SafeAreaView, ScrollView, StyleSheet, Text, View } from 'react-native'
 import SkeletonPlaceholder from 'react-native-skeleton-placeholder'
@@ -10,7 +10,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import { usePrepareTransactions } from 'src/earn/hooks'
+import { usePrepareClaimExitAndWithdrawTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { EarnActiveMode } from 'src/earn/types'
@@ -29,7 +29,6 @@ import { Spacing } from 'src/styles/styles'
 import { useTokenInfo } from 'src/tokens/hooks'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
-import Logger from 'src/utils/Logger'
 import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { walletAddressSelector } from 'src/web3/selectors'
@@ -37,9 +36,6 @@ import { isAddress } from 'viem'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.EarnConfirmationScreen>
 
-const TAG = 'EarnConfirmationScreen'
-const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
-
 export default function EarnConfirmationScreen({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
@@ -82,47 +78,18 @@ export default function EarnConfirmationScreen({ route }: Props) {
   )
 
   const {
-    prepareTransactionsResult: { prepareTransactionsResult } = {},
-    refreshPreparedTransactions,
-    clearPreparedTransactions,
-    prepareTransactionError,
-    isPreparingTransactions,
-  } = usePrepareTransactions(mode, { rewardsPositions })
-
-  const handleRefreshPreparedTransactions = (
-    amount: BigNumber,
-    token: TokenBalance,
-    feeCurrencies: TokenBalance[]
-  ) => {
-    if (!walletAddress || !isAddress(walletAddress)) {
-      Logger.error(TAG, 'Wallet address not set. Cannot refresh prepared transactions.')
-      return
-    }
-
-    return refreshPreparedTransactions({
-      amount: amount.toString(),
-      token,
-      walletAddress,
-      feeCurrencies,
-      pool,
-      hooksApiUrl,
-      shortcutId: mode,
-      useMax,
-    })
-  }
-
-  useEffect(() => {
-    clearPreparedTransactions()
-
-    const debouncedRefreshTransactions = setTimeout(() => {
-      return handleRefreshPreparedTransactions(
-        withdrawAmountInDepositToken,
-        withdrawToken,
-        feeCurrencies
-      )
-    }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
-    return () => clearTimeout(debouncedRefreshTransactions)
-  }, [withdrawAmountInDepositToken, depositToken, feeCurrencies])
+    result: prepareTransactionsResult,
+    loading: isPreparingTransactions,
+    error: prepareTransactionError,
+  } = usePrepareClaimExitAndWithdrawTransactions(mode, {
+    amount: withdrawAmountInDepositToken.dividedBy(pool.pricePerShare[0]).toString(),
+    pool,
+    walletAddress,
+    feeCurrencies,
+    hooksApiUrl,
+    rewardsPositions,
+    useMax: !!useMax,
+  })
 
   const onPress = () => {
     if (prepareTransactionsResult?.type !== 'possible') {
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 2d45561f4c8..5db9b717554 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,7 +21,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import { usePrepareTransactions } from 'src/earn/hooks'
+import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -144,13 +144,12 @@ function EarnEnterAmount({ route }: Props) {
   }
 
   const {
-    // @ts-expect-error swapTransaction only exists on swap-deposit mode
     prepareTransactionsResult: { prepareTransactionsResult, swapTransaction } = {},
     refreshPreparedTransactions,
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = usePrepareTransactions(mode)
+  } = usePrepareDepositAndWithdrawTransactions(mode)
 
   const walletAddress = useSelector(walletAddressSelector)
 
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 819218ef7bf..399462375e9 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -5,6 +5,7 @@ import {
   prepareDepositTransactions,
   prepareWithdrawAndClaimTransactions,
   prepareWithdrawTransactions,
+  prepareWithdrawTransactionsWithSwap,
 } from 'src/earn/prepareTransactions'
 import { EarnActiveMode } from 'src/earn/types'
 import { fetchExchanges } from 'src/fiatExchanges/utils'
@@ -16,9 +17,10 @@ import { useSelector } from 'src/redux/hooks'
 import { getFeatureGate } from 'src/statsig'
 import { StatsigFeatureGates } from 'src/statsig/types'
 import { useCashInTokens, useSwappableTokens } from 'src/tokens/hooks'
-import { TokenBalances } from 'src/tokens/slice'
+import { TokenBalance, TokenBalances } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
+import { Address } from 'viem'
 
 const TAG = 'earn/hooks'
 
@@ -91,9 +93,8 @@ export function useDepositEntrypointInfo({
   return { hasDepositToken, hasTokensOnSameNetwork, hasTokensOnOtherNetworks, canCashIn, exchanges }
 }
 
-export function usePrepareTransactions(
-  mode: EarnActiveMode,
-  additionalArgs?: { rewardsPositions: Position[] }
+export function usePrepareDepositAndWithdrawTransactions(
+  mode: Extract<EarnActiveMode, 'deposit' | 'withdraw' | 'swap-deposit'>
 ) {
   const getTransactionFunction = () => {
     switch (mode) {
@@ -101,11 +102,7 @@ export function usePrepareTransactions(
       case 'swap-deposit':
         return prepareDepositTransactions
       case 'withdraw':
-        return prepareWithdrawTransactions
-      case 'claim-rewards':
-        return prepareClaimTransactions
-      case 'exit':
-        return prepareWithdrawAndClaimTransactions
+        return prepareWithdrawTransactionsWithSwap
       default:
         throw new Error(`Invalid mode: ${mode}`)
     }
@@ -113,20 +110,12 @@ export function usePrepareTransactions(
 
   const prepareTransactions = useAsyncCallback(
     async (args) => {
-      const modifiedArgs = { ...args }
-      // Add rewardsPositions passed to usePrepareTransactions if the mode is 'exit' or 'claim-rewards'
-      if (mode === 'exit' || mode === 'claim-rewards') {
-        modifiedArgs.rewardsPositions = additionalArgs?.rewardsPositions
-      }
-      // Get the appropriate function based on the mode
-      const prepareFunction = getTransactionFunction()
-      // Ensure the function is called with the necessary arguments
-      return prepareFunction(modifiedArgs)
+      return getTransactionFunction()(args)
     },
     {
       onError: (err) => {
         const error = ensureError(err)
-        Logger.error(TAG, 'usePrepareTransactions - Error:', error)
+        Logger.error(TAG, 'usePrepareDepositAndWithdrawTransactions - Error:', error)
       },
     }
   )
@@ -139,3 +128,32 @@ export function usePrepareTransactions(
     isPreparingTransactions: prepareTransactions.loading,
   }
 }
+
+export function usePrepareClaimExitAndWithdrawTransactions(
+  mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>,
+  params: {
+    pool: EarnPosition
+    walletAddress: Address
+    feeCurrencies: TokenBalance[]
+    hooksApiUrl: string
+    amount: string
+    useMax: boolean
+    rewardsPositions: Position[]
+  }
+) {
+  return useAsync(
+    () =>
+      mode === 'claim-rewards'
+        ? prepareClaimTransactions(params)
+        : mode === 'exit'
+          ? prepareWithdrawAndClaimTransactions(params)
+          : prepareWithdrawTransactions(params),
+    [],
+    {
+      onError: (err) => {
+        const error = ensureError(err)
+        Logger.error(TAG, 'usePrepareWithdrawAndClaimTransactions', error)
+      },
+    }
+  )
+}
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index cc6b8283bd8..9ecad0ba09b 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -16,6 +16,7 @@ import { Address } from 'viem'
 
 const TAG = 'earn/prepareTransactions'
 
+// Used on the EarnEnterAmount.tsx Screen
 export async function prepareDepositTransactions({
   amount,
   token,
@@ -31,7 +32,7 @@ export async function prepareDepositTransactions({
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  shortcutId: Exclude<EarnActiveMode, 'exit'>
+  shortcutId: Extract<EarnActiveMode, 'deposit' | 'swap-deposit'>
 }) {
   const { appId, networkId } = pool
   const { enableAppFee } = getDynamicConfigParams(DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG])
@@ -91,6 +92,56 @@ export async function prepareDepositTransactions({
   }
 }
 
+export async function prepareWithdrawTransactionsWithSwap({
+  amount,
+  walletAddress,
+  feeCurrencies,
+  pool,
+  hooksApiUrl,
+  useMax,
+}: {
+  amount?: string
+  walletAddress: Address
+  feeCurrencies: TokenBalance[]
+  pool: EarnPosition
+  hooksApiUrl: string
+  useMax?: boolean
+}) {
+  const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
+  const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
+    await triggerShortcutRequest(hooksApiUrl, {
+      address: walletAddress,
+      appId,
+      networkId,
+      shortcutId: 'withdraw',
+      tokens: [
+        {
+          tokenId: dataProps.withdrawTokenId,
+          amount: useMax ? balance : amount,
+          useMax,
+        },
+      ],
+      ...shortcutTriggerArgs?.withdraw,
+    })
+  Logger.debug(TAG, 'prepareWithdrawTransactions', {
+    withdrawTransactions,
+    pool,
+  })
+
+  // Is there a better way to do this?
+  // Pass a param to a shared prepareTransactions function to indicate that the transaction should also return swapTransaction:
+  return {
+    prepareTransactionsResult: await prepareTransactions({
+      feeCurrencies,
+      baseTransactions: rawShortcutTransactionsToTransactionRequests(withdrawTransactions),
+      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+      origin: 'earn-withdraw',
+    }),
+    swapTransaction: undefined,
+  }
+}
+
+// Used on the EarnConfirmationScreen.tsx
 export async function prepareWithdrawAndClaimTransactions({
   walletAddress,
   feeCurrencies,
@@ -141,17 +192,15 @@ export async function prepareWithdrawAndClaimTransactions({
     pool,
   })
 
-  return {
-    prepareTransactionsResult: await prepareTransactions({
-      feeCurrencies,
-      baseTransactions: rawShortcutTransactionsToTransactionRequests([
-        ...withdrawTransactions,
-        ...(dataProps.withdrawalIncludesClaim ? [] : claimTransactions.flat()),
-      ]),
-      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
-      origin: 'earn-withdraw',
-    }),
-  }
+  return prepareTransactions({
+    feeCurrencies,
+    baseTransactions: rawShortcutTransactionsToTransactionRequests([
+      ...withdrawTransactions,
+      ...(dataProps.withdrawalIncludesClaim ? [] : claimTransactions.flat()),
+    ]),
+    isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+    origin: 'earn-withdraw',
+  })
 }
 
 export async function prepareWithdrawTransactions({
@@ -190,14 +239,12 @@ export async function prepareWithdrawTransactions({
     pool,
   })
 
-  return {
-    prepareTransactionsResult: await prepareTransactions({
-      feeCurrencies,
-      baseTransactions: rawShortcutTransactionsToTransactionRequests(withdrawTransactions),
-      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
-      origin: 'earn-withdraw',
-    }),
-  }
+  return prepareTransactions({
+    feeCurrencies,
+    baseTransactions: rawShortcutTransactionsToTransactionRequests(withdrawTransactions),
+    isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+    origin: 'earn-withdraw',
+  })
 }
 
 export async function prepareClaimTransactions({
@@ -205,13 +252,13 @@ export async function prepareClaimTransactions({
   walletAddress,
   feeCurrencies,
   hooksApiUrl,
-  rewardsPositions,
+  rewardsPositions = [],
 }: {
   pool: EarnPosition
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   hooksApiUrl: string
-  rewardsPositions: Position[]
+  rewardsPositions?: Position[]
 }) {
   const { appId, networkId } = pool
 
@@ -226,7 +273,7 @@ export async function prepareClaimTransactions({
           shortcutId: 'claim-rewards',
           ...position.shortcutTriggerArgs?.['claim-rewards'],
         })
-      return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
+      return transactions ?? []
     })
   )
 
@@ -234,12 +281,11 @@ export async function prepareClaimTransactions({
     claimTransactions,
     pool,
   })
-  return {
-    prepareTransactionsResult: await prepareTransactions({
-      feeCurrencies,
-      baseTransactions: rawShortcutTransactionsToTransactionRequests(claimTransactions.flat()),
-      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
-      origin: 'earn-claim-rewards',
-    }),
-  }
+
+  return prepareTransactions({
+    feeCurrencies,
+    baseTransactions: rawShortcutTransactionsToTransactionRequests(claimTransactions.flat()),
+    isGasSubsidized: isGasSubsidizedForNetwork(networkId),
+    origin: 'earn-claim-rewards',
+  })
 }

From 7f2e5e19916ba55ff742743a90df70c27b537a06 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 23:10:17 -0700
Subject: [PATCH 100/118] test(earn): hooks and prepare transactions

---
 src/earn/EarnConfirmationScreen.test.tsx | 109 ++++--------------
 src/earn/EarnEnterAmount.test.tsx        |  33 +++---
 src/earn/hooks.test.tsx                  | 135 ++---------------------
 src/earn/prepareTransactions.test.ts     |  30 ++---
 4 files changed, 58 insertions(+), 249 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index bde68a958ad..f7427e16b51 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -5,7 +5,11 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnConfirmationScreen from 'src/earn/EarnConfirmationScreen'
-import { usePrepareTransactions } from 'src/earn/hooks'
+import {
+  prepareClaimTransactions,
+  prepareWithdrawAndClaimTransactions,
+  prepareWithdrawTransactions,
+} from 'src/earn/prepareTransactions'
 import { withdrawStart } from 'src/earn/slice'
 import { isGasSubsidizedForNetwork } from 'src/earn/utils'
 import { navigate } from 'src/navigator/NavigationService'
@@ -15,13 +19,11 @@ import { StatsigFeatureGates } from 'src/statsig/types'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
-import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
+import { createMockStore } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
   mockAaveArbUsdcTokenId,
-  mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
   mockArbUsdcTokenId,
@@ -58,12 +60,7 @@ jest.mock('src/earn/utils', () => ({
   ...(jest.requireActual('src/earn/utils') as any),
   isGasSubsidizedForNetwork: jest.fn(),
 }))
-jest.mock('src/earn/hooks')
-jest.mock('src/earn/prepareTransactions', () => ({
-  ...jest.requireActual('src/earn/prepareTransactions'),
-  prepareWithdrawAndClaimTransactions: jest.fn(),
-  prepareWithdrawTransactions: jest.fn(),
-}))
+jest.mock('src/earn/prepareTransactions')
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
   type: 'possible' as const,
@@ -96,24 +93,17 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
 }
 
 describe('EarnConfirmationScreen', () => {
-  const refreshPreparedTransactionsSpy = jest.fn()
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue(mockPreparedTransaction)
+    jest.mocked(prepareClaimTransactions).mockResolvedValue(mockPreparedTransaction)
+    jest.mocked(prepareWithdrawTransactions).mockResolvedValue(mockPreparedTransaction)
     jest
       .mocked(getFeatureGate)
       .mockImplementation(
         (gateName: StatsigFeatureGates) => gateName === StatsigFeatureGates.SHOW_POSITIONS
       )
     jest.mocked(isGasSubsidizedForNetwork).mockReturnValue(false)
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: mockPreparedTransaction,
-      },
-      refreshPreparedTransactions: refreshPreparedTransactionsSpy,
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
-    })
     store.clearActions()
   })
 
@@ -125,6 +115,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
             mode: 'Exit',
+            useMax: true,
           }}
         />
       </Provider>
@@ -139,6 +130,9 @@ describe('EarnConfirmationScreen', () => {
       '₱15.73'
     )
 
+    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
+
     expect(getByText('earnFlow.collect.reward')).toBeTruthy()
     expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
       '0.01 ARB'
@@ -155,25 +149,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
-    expect(usePrepareTransactions).toHaveBeenCalledWith('Exit', {
-      rewardsPositions: [mockRewardsPositions[1]],
-    })
-    await waitFor(() => expect(refreshPreparedTransactionsSpy).toHaveBeenCalledTimes(1))
-    expect(refreshPreparedTransactionsSpy).toHaveBeenCalledWith({
-      shortcutId: 'Exit',
-      token: {
-        ...mockStoreTokens?.tokenBalances[mockAaveArbUsdcTokenId],
-        priceUsd: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].priceUsd!),
-        balance: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].balance!),
-        lastKnownPriceUsd: new BigNumber('1'),
-      },
-      amount: '11.825',
-      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
-      pool: { ...mockEarnPositions[0], balance: '10.75' },
-      hooksApiUrl: networkConfig.hooksApiUrl,
-      walletAddress: mockAccount.toLowerCase(),
-      useMax: undefined,
-    })
     expect(store.getActions()).toEqual([])
   })
 
@@ -209,22 +184,6 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
-    await waitFor(() => expect(refreshPreparedTransactionsSpy).toHaveBeenCalledTimes(1))
-    expect(refreshPreparedTransactionsSpy).toHaveBeenCalledWith({
-      shortcutId: 'withdraw',
-      token: {
-        ...mockStoreTokens?.tokenBalances[mockAaveArbUsdcTokenId],
-        priceUsd: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].priceUsd!),
-        balance: new BigNumber(mockStoreTokens.tokenBalances[mockAaveArbUsdcTokenId].balance!),
-        lastKnownPriceUsd: new BigNumber('1'),
-      },
-      amount: '5.9125000000000005',
-      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
-      pool: { ...mockEarnPositions[0], balance: '10.75' },
-      hooksApiUrl: networkConfig.hooksApiUrl,
-      walletAddress: mockAccount.toLowerCase(),
-      useMax: undefined,
-    })
     expect(store.getActions()).toEqual([])
   })
 
@@ -273,14 +232,7 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('shows error and keeps cta disabled if prepare tx fails', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: undefined,
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: new Error('Failed to prepare'),
-      isPreparingTransactions: false,
-    })
-
+    jest.mocked(prepareWithdrawTransactions).mockRejectedValue(new Error('Failed to prepare'))
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -306,18 +258,9 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('disables cta if not enough balance for gas', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: {
-          ...mockPreparedTransaction,
-          type: 'not-enough-balance-for-gas',
-          feeCurrencies: [mockPreparedTransaction.feeCurrency],
-        },
-      },
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
+    jest.mocked(prepareWithdrawTransactions).mockResolvedValue({
+      type: 'not-enough-balance-for-gas',
+      feeCurrencies: [mockPreparedTransaction.feeCurrency],
     })
 
     const { getByText, getByTestId, queryByTestId } = render(
@@ -417,20 +360,10 @@ describe('EarnConfirmationScreen', () => {
   })
 
   it('navigate and fire analytics on no gas CTA press', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
-      prepareTransactionsResult: {
-        prepareTransactionsResult: {
-          ...mockPreparedTransaction,
-          type: 'not-enough-balance-for-gas',
-          feeCurrencies: [mockPreparedTransaction.feeCurrency],
-        },
-      },
-      refreshPreparedTransactions: jest.fn(),
-      clearPreparedTransactions: jest.fn(),
-      prepareTransactionError: undefined,
-      isPreparingTransactions: false,
+    jest.mocked(prepareWithdrawTransactions).mockResolvedValue({
+      type: 'not-enough-balance-for-gas',
+      feeCurrencies: [mockPreparedTransaction.feeCurrency],
     })
-
     const { getByText, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index e4fa3c25db5..8cd40dac0f5 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import { usePrepareTransactions } from 'src/earn/hooks'
+import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -162,7 +162,7 @@ describe('EarnEnterAmount', () => {
       .mocked(getNumberFormatSettings)
       .mockReturnValue({ decimalSeparator: '.', groupingSeparator: ',' })
     store.clearActions()
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: refreshPreparedTransactionsSpy,
       clearPreparedTransactions: jest.fn(),
@@ -214,9 +214,10 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareTransactions).mockReturnValue({
+      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
+          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -342,10 +343,9 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareTransactions).mockReturnValue({
+      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
-          // @ts-expect-error
           swapTransaction: mockSwapTransaction,
         },
         refreshPreparedTransactions: jest.fn(),
@@ -443,9 +443,10 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details for withdrawal', async () => {
-      jest.mocked(usePrepareTransactions).mockReturnValue({
+      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
+          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -497,9 +498,10 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should allow the user to set an input value over the pool balance if pricePerShare is greater than 1', async () => {
-      jest.mocked(usePrepareTransactions).mockReturnValue({
+      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
+          swapTransaction: undefined,
         },
         refreshPreparedTransactions: jest.fn(),
         clearPreparedTransactions: jest.fn(),
@@ -579,9 +581,10 @@ describe('EarnEnterAmount', () => {
 
   // tests independent of deposit / swap-deposit
   it('should show a warning and not allow the user to continue if they input an amount greater than balance', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
+        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -601,7 +604,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show loading spinner when preparing transaction', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -674,9 +677,10 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should track analytics and navigate correctly when tapping cta to add gas', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransactionNotEnough,
+        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -710,9 +714,10 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show the FeeDetailsBottomSheet when the user taps the fee details icon', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
+        swapTransaction: undefined,
       },
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -734,10 +739,9 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show swap fees on the FeeDetailsBottomSheet when swap transaction is present', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
-        // @ts-expect-error
         swapTransaction: mockSwapTransaction,
       },
       refreshPreparedTransactions: jest.fn(),
@@ -766,10 +770,9 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should display swap bottom sheet when the user taps the swap details icon', async () => {
-    jest.mocked(usePrepareTransactions).mockReturnValue({
+    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
-        // @ts-expect-error
         swapTransaction: mockSwapTransaction,
       },
       refreshPreparedTransactions: jest.fn(),
diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
index 53529c5086c..41f888dfa45 100644
--- a/src/earn/hooks.test.tsx
+++ b/src/earn/hooks.test.tsx
@@ -3,9 +3,9 @@ import BigNumber from 'bignumber.js'
 import { FetchMock } from 'jest-fetch-mock/types'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { usePrepareTransactions } from 'src/earn/hooks'
+import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
 import { RawShortcutTransaction } from 'src/positions/slice'
-import { Position, ShortcutStatus } from 'src/positions/types'
+import { ShortcutStatus } from 'src/positions/types'
 import { TokenBalance } from 'src/tokens/slice'
 import { NetworkId } from 'src/transactions/types'
 import { prepareTransactions } from 'src/viem/prepareTransactions'
@@ -19,7 +19,6 @@ import {
   mockArbUsdcTokenId,
   mockEarnPositions,
   mockPositions,
-  mockRewardsPositions,
   mockShortcuts,
   mockTokenBalances,
 } from 'test/values'
@@ -153,64 +152,6 @@ const expectedPrepareTransactionsResult = {
   },
 }
 
-const expectedClaimTransactionResult = {
-  prepareTransactionsResult: {
-    type: 'possible',
-    transactions: [
-      {
-        from: '0xfrom',
-        to: '0xto',
-        data: '0xdata',
-        gas,
-        maxFeePerGas,
-        _baseFeePerGas,
-      },
-      {
-        from: '0xfrom',
-        to: '0xto',
-        data: '0xdata',
-        gas,
-        maxFeePerGas,
-        _baseFeePerGas,
-      },
-    ],
-    feeCurrency: mockFeeCurrencies[0],
-  },
-}
-
-const expectedExitTransactionResult = {
-  prepareTransactionsResult: {
-    type: 'possible',
-    transactions: [
-      {
-        from: '0xfrom',
-        to: '0xto',
-        data: '0xdata',
-        gas,
-        maxFeePerGas,
-        _baseFeePerGas,
-      },
-      {
-        from: '0xfrom',
-        to: '0xto',
-        data: '0xdata',
-        gas,
-        maxFeePerGas,
-        _baseFeePerGas,
-      },
-      {
-        from: '0xfrom',
-        to: '0xto',
-        data: '0xdata',
-        gas,
-        maxFeePerGas,
-        _baseFeePerGas,
-      },
-    ],
-    feeCurrency: mockFeeCurrencies[0],
-  },
-}
-
 const expectedSwapDepositPrepareTransactionsResult = {
   prepareTransactionsResult: {
     feeCurrency: mockFeeCurrencies[0],
@@ -261,7 +202,7 @@ const expectedSwapDepositPrepareTransactionsResult = {
   },
 }
 
-describe('usePrepareTransactions', () => {
+describe('usePrepareDepositAndWithdrawTransactions', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(prepareTransactions).mockImplementation(async ({ baseTransactions }) => ({
@@ -291,28 +232,6 @@ describe('usePrepareTransactions', () => {
       expectedPrepareTransactionsResult: expectedPrepareTransactionsResult,
       mockRefreshArgs: mockRefreshArgs,
     },
-    {
-      mode: 'claim-rewards',
-      extraArgs: { rewardsPositions: mockRewardsPositions },
-      title: 'calls correct transaction preparation for claim-rewards with rewardsPositions',
-      mockResponseBody: mockResponseBody,
-      expectedPrepareTransactionsResult: expectedClaimTransactionResult,
-      mockRefreshArgs: mockRefreshArgs,
-    },
-    {
-      mode: 'claim-rewards',
-      extraArgs: { rewardsPositions: [] as Position[] },
-      title: 'calls correct transaction preparation for claim-rewards with no rewardsPositions',
-      mockResponseBody: mockResponseBody,
-      expectedPrepareTransactionsResult: {
-        ...expectedClaimTransactionResult,
-        prepareTransactionsResult: {
-          ...expectedClaimTransactionResult.prepareTransactionsResult,
-          transactions: [],
-        },
-      },
-      mockRefreshArgs: mockRefreshArgs,
-    },
     {
       mode: 'deposit',
       title: 'calls correct transaction preparation for deposit',
@@ -333,44 +252,10 @@ describe('usePrepareTransactions', () => {
         token: mockTokenBalances[mockArbUsdcTokenId],
       },
     },
-    {
-      mode: 'exit',
-      extraArgs: { rewardsPositions: mockRewardsPositions },
-      title: 'calls correct transaction preparation for exit',
-      mockResponseBody: mockResponseBody,
-      expectedPrepareTransactionsResult: expectedExitTransactionResult,
-      mockRefreshArgs: mockRefreshArgs,
-    },
-    {
-      mode: 'exit',
-      extraArgs: { rewardsPositions: mockRewardsPositions },
-      title: 'calls correct transaction preparation for exit when withdrawalIncludesClaim is true',
-      mockResponseBody: mockResponseBody,
-      expectedPrepareTransactionsResult: {
-        ...expectedExitTransactionResult,
-        prepareTransactionsResult: {
-          ...expectedExitTransactionResult.prepareTransactionsResult,
-          transactions: [expectedExitTransactionResult.prepareTransactionsResult.transactions[0]],
-        },
-      },
-      mockRefreshArgs: {
-        ...mockRefreshArgs,
-        pool: {
-          ...mockEarnPositions[0],
-          dataProps: { ...mockEarnPositions[0].dataProps, withdrawalIncludesClaim: true },
-        },
-      },
-    },
   ] as const)(
     '$title',
-    async ({
-      mode,
-      extraArgs,
-      mockResponseBody,
-      expectedPrepareTransactionsResult,
-      mockRefreshArgs,
-    }) => {
-      const { result } = renderHook(() => usePrepareTransactions(mode, extraArgs), {
+    async ({ mode, mockResponseBody, expectedPrepareTransactionsResult, mockRefreshArgs }) => {
+      const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions(mode), {
         wrapper: (component) => (
           <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
             {component?.children ? component.children : component}
@@ -398,7 +283,7 @@ describe('usePrepareTransactions', () => {
   )
 
   it('errors when unable to trigger shortcut error response from hooks API', async () => {
-    const { result } = renderHook(() => usePrepareTransactions('withdraw'), {
+    const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions('withdraw'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
@@ -413,14 +298,11 @@ describe('usePrepareTransactions', () => {
     await expect(result.current.refreshPreparedTransactions(mockRefreshArgs)).rejects.toEqual(
       new Error('Unable to trigger shortcut: 500 Internal Server Error')
     )
-
-    // TODO test that result.current.prepareTransactionError is set correctly
-    // expect(result.current.prepareTransactionError).toEqual(new Error('Unable to trigger shortcut: 500 Internal Server Error'))
   })
 
   it('errors when invalid mode is passed', async () => {
     // @ts-expect-error intentionally passing invalid mode
-    const { result } = renderHook(() => usePrepareTransactions('invalid-mode'), {
+    const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions('invalid-mode'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
@@ -431,8 +313,5 @@ describe('usePrepareTransactions', () => {
     await expect(result.current.refreshPreparedTransactions(mockRefreshArgs)).rejects.toEqual(
       new Error('Invalid mode: invalid-mode')
     )
-
-    // TODO test that result.current.prepareTransactionError is set correctly
-    // expect(result.current.prepareTransactionError).toEqual(new Error('Invalid mode: invalid-mode'))
   })
 })
diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 1c9394deb88..e213a29e099 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -71,7 +71,7 @@ describe('prepareTransactions', () => {
     })
   })
 
-  describe('prepareDepositTransactions', () => {
+  describe('prepareDpositTransactions', () => {
     it('prepares transactions using deposit shortcut', async () => {
       jest.mocked(triggerShortcutRequest).mockResolvedValue({
         transactions: [
@@ -311,7 +311,7 @@ describe('prepareTransactions', () => {
           value: undefined,
         },
       ]
-      expect(result.prepareTransactionsResult).toEqual({
+      expect(result).toEqual({
         type: 'possible',
         feeCurrency: mockFeeCurrency,
         transactions: expectedTransactions,
@@ -365,7 +365,7 @@ describe('prepareTransactions', () => {
           _estimatedGasUse: BigInt(49900),
         },
       ]
-      expect(result.prepareTransactionsResult).toEqual({
+      expect(result).toEqual({
         type: 'possible',
         feeCurrency: mockFeeCurrency,
         transactions: expectedTransactions,
@@ -431,11 +431,9 @@ describe('prepareTransactions', () => {
       ]
 
       expect(result).toEqual({
-        prepareTransactionsResult: {
-          type: 'possible',
-          feeCurrency: mockFeeCurrency,
-          transactions: expectedTransactions,
-        },
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
       })
 
       expect(prepareTransactions).toHaveBeenCalledWith({
@@ -491,11 +489,9 @@ describe('prepareTransactions', () => {
       ]
 
       expect(result).toEqual({
-        prepareTransactionsResult: {
-          type: 'possible',
-          feeCurrency: mockFeeCurrency,
-          transactions: expectedTransactions,
-        },
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
       })
 
       expect(prepareTransactions).toHaveBeenCalledWith({
@@ -552,11 +548,9 @@ describe('prepareTransactions', () => {
       ]
 
       expect(result).toEqual({
-        prepareTransactionsResult: {
-          type: 'possible',
-          feeCurrency: mockFeeCurrency,
-          transactions: expectedTransactions,
-        },
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
       })
     })
   })

From b7a025c8f6c15779ef044e5524c79c09f4857104 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 23:19:57 -0700
Subject: [PATCH 101/118] style: self review

---
 src/earn/EarnEnterAmount.tsx         | 10 ++--------
 src/earn/prepareTransactions.test.ts |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 5db9b717554..178418e70b0 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -482,17 +482,11 @@ function EarnEnterAmount({ route }: Props) {
             })}
             description={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.description', {
               feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
-              network:
-                NETWORK_NAMES[
-                  prepareTransactionsResult.feeCurrencies[0].networkId as keyof typeof NETWORK_NAMES
-                ],
+              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
             })}
             ctaLabel={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.noGasCta', {
               feeTokenSymbol: feeCurrencies[0].symbol,
-              network:
-                NETWORK_NAMES[
-                  prepareTransactionsResult.feeCurrencies[0].networkId as keyof typeof NETWORK_NAMES
-                ],
+              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
             })}
             onPressCta={() => {
               AppAnalytics.track(EarnEvents.earn_deposit_add_gas_press, {
diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index e213a29e099..78c985b88ba 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -71,7 +71,7 @@ describe('prepareTransactions', () => {
     })
   })
 
-  describe('prepareDpositTransactions', () => {
+  describe('prepareDepositTransactions', () => {
     it('prepares transactions using deposit shortcut', async () => {
       jest.mocked(triggerShortcutRequest).mockResolvedValue({
         transactions: [
@@ -300,7 +300,6 @@ describe('prepareTransactions', () => {
           data: '0xencodedData',
           gas: BigInt(50200),
           _estimatedGasUse: BigInt(49900),
-          value: undefined,
         },
         {
           from: '0x1234',
@@ -308,7 +307,6 @@ describe('prepareTransactions', () => {
           data: '0xencodedData',
           gas: BigInt(50100),
           _estimatedGasUse: BigInt(49800),
-          value: undefined,
         },
       ]
       expect(result).toEqual({

From d806a89bd8b386a84af0ccb6c0a851eb2a11ddf0 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 31 Oct 2024 23:22:14 -0700
Subject: [PATCH 102/118] test(earn): remove optional param

---
 src/earn/EarnConfirmationScreen.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index f7427e16b51..77809415a69 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -115,7 +115,6 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
             mode: 'Exit',
-            useMax: true,
           }}
         />
       </Provider>

From e2d92f15d1a4aeab5cdc6bdac95792d010558075 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 14:06:45 -0700
Subject: [PATCH 103/118] chore(earn): make useMax required

---
 src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx  | 1 +
 src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx       | 2 +-
 src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx | 2 ++
 src/earn/poolInfoScreen/WithdrawBottomSheet.tsx      | 4 ++--
 src/navigator/types.tsx                              | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx b/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
index 2b2a77ef0f5..8618813c6f7 100644
--- a/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
+++ b/src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx
@@ -669,6 +669,7 @@ describe('EarnPoolInfoScreen', () => {
     expect(navigate).toHaveBeenCalledWith(Screens.EarnConfirmationScreen, {
       pool: { ...mockEarnPositions[0], balance: '100' },
       mode: 'exit',
+      useMax: true,
     })
   })
   it('open WithdrawBottomSheet when Withdraw button pressed, check that expected options exist', () => {
diff --git a/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx b/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
index 77addd562a9..d7a0343b91c 100644
--- a/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
+++ b/src/earn/poolInfoScreen/EarnPoolInfoScreen.tsx
@@ -226,7 +226,7 @@ export default function EarnPoolInfoScreen({ route, navigation }: Props) {
     if (partialWithdrawalsEnabled) {
       withdrawBottomSheetRef.current?.snapToIndex(0)
     } else {
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit' })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit', useMax: true })
     }
   }
 
diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
index 69960003129..ca3f85b5eed 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.test.tsx
@@ -104,6 +104,7 @@ describe('WithdrawBottomSheet', () => {
         balance: '100',
       },
       mode: 'claim-rewards',
+      useMax: true,
     })
   })
   it('tapping exit on WithdrawBottomSheet navigates to enter amount screen', () => {
@@ -134,6 +135,7 @@ describe('WithdrawBottomSheet', () => {
         balance: '100',
       },
       mode: 'exit',
+      useMax: true,
     })
   })
   it('shows correct copy when ClaimType is Earnings', () => {
diff --git a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
index 76a8fd6ed74..690c4b0c514 100644
--- a/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
+++ b/src/earn/poolInfoScreen/WithdrawBottomSheet.tsx
@@ -85,7 +85,7 @@ function ClaimAction({
         networkId: pool.networkId,
         depositTokenId: pool.dataProps.depositTokenId,
       })
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'claim-rewards' })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'claim-rewards', useMax: true })
       forwardedRef.current?.close()
     },
   }
@@ -123,7 +123,7 @@ function ExitAction({
         networkId: pool.networkId,
         depositTokenId: pool.dataProps.depositTokenId,
       })
-      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit' })
+      navigate(Screens.EarnConfirmationScreen, { pool, mode: 'exit', useMax: true })
       forwardedRef.current?.close()
     },
   }
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 181bc51faff..52460f39da5 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -87,7 +87,7 @@ export type StackParamList = {
     pool: EarnPosition
     mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>
     inputAmount?: string
-    useMax?: boolean
+    useMax: boolean
   }
   [Screens.EarnHome]: { activeEarnTab?: EarnTabType } | undefined
   [Screens.EarnPoolInfoScreen]: { pool: EarnPosition }

From 501c1c34409b34d4835f919c48cb863eb29ae49d Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 14:14:06 -0700
Subject: [PATCH 104/118] style(earn): use correct function name in logger

---
 src/earn/prepareTransactions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 9ecad0ba09b..13d4fdb5579 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -123,7 +123,7 @@ export async function prepareWithdrawTransactionsWithSwap({
       ],
       ...shortcutTriggerArgs?.withdraw,
     })
-  Logger.debug(TAG, 'prepareWithdrawTransactions', {
+  Logger.debug(TAG, 'prepareWithdrawTransactionsWithSwap', {
     withdrawTransactions,
     pool,
   })

From 457a5945c8df94df36661f7b934ab0b2c17a4ce1 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 14:26:50 -0700
Subject: [PATCH 105/118] style(earn): rename hooks to reflect screens where
 they are used

---
 src/earn/EarnConfirmationScreen.tsx |  4 ++--
 src/earn/EarnEnterAmount.test.tsx   | 24 ++++++++++++------------
 src/earn/EarnEnterAmount.tsx        |  4 ++--
 src/earn/hooks.test.tsx             | 10 +++++-----
 src/earn/hooks.ts                   | 10 ++++++----
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 8b7039aed80..859ff3e5707 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -10,7 +10,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import { usePrepareClaimExitAndWithdrawTransactions } from 'src/earn/hooks'
+import { usePrepareEnterConfirmationScreenTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { EarnActiveMode } from 'src/earn/types'
@@ -81,7 +81,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     result: prepareTransactionsResult,
     loading: isPreparingTransactions,
     error: prepareTransactionError,
-  } = usePrepareClaimExitAndWithdrawTransactions(mode, {
+  } = usePrepareEnterConfirmationScreenTransactions(mode, {
     amount: withdrawAmountInDepositToken.dividedBy(pool.pricePerShare[0]).toString(),
     pool,
     walletAddress,
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 8cd40dac0f5..024d2f19176 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -162,7 +162,7 @@ describe('EarnEnterAmount', () => {
       .mocked(getNumberFormatSettings)
       .mockReturnValue({ decimalSeparator: '.', groupingSeparator: ',' })
     store.clearActions()
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: refreshPreparedTransactionsSpy,
       clearPreparedTransactions: jest.fn(),
@@ -214,7 +214,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -343,7 +343,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: mockSwapTransaction,
@@ -443,7 +443,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details for withdrawal', async () => {
-      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -498,7 +498,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should allow the user to set an input value over the pool balance if pricePerShare is greater than 1', async () => {
-      jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -581,7 +581,7 @@ describe('EarnEnterAmount', () => {
 
   // tests independent of deposit / swap-deposit
   it('should show a warning and not allow the user to continue if they input an amount greater than balance', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -604,7 +604,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show loading spinner when preparing transaction', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -677,7 +677,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should track analytics and navigate correctly when tapping cta to add gas', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransactionNotEnough,
         swapTransaction: undefined,
@@ -714,7 +714,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show the FeeDetailsBottomSheet when the user taps the fee details icon', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -739,7 +739,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show swap fees on the FeeDetailsBottomSheet when swap transaction is present', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
@@ -770,7 +770,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should display swap bottom sheet when the user taps the swap details icon', async () => {
-    jest.mocked(usePrepareDepositAndWithdrawTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 178418e70b0..bdb4ee9e60d 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,7 +21,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -149,7 +149,7 @@ function EarnEnterAmount({ route }: Props) {
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = usePrepareDepositAndWithdrawTransactions(mode)
+  } = usePrepareEnterAmountTransactions(mode)
 
   const walletAddress = useSelector(walletAddressSelector)
 
diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
index 41f888dfa45..1246557d925 100644
--- a/src/earn/hooks.test.tsx
+++ b/src/earn/hooks.test.tsx
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js'
 import { FetchMock } from 'jest-fetch-mock/types'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { usePrepareDepositAndWithdrawTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
 import { RawShortcutTransaction } from 'src/positions/slice'
 import { ShortcutStatus } from 'src/positions/types'
 import { TokenBalance } from 'src/tokens/slice'
@@ -202,7 +202,7 @@ const expectedSwapDepositPrepareTransactionsResult = {
   },
 }
 
-describe('usePrepareDepositAndWithdrawTransactions', () => {
+describe('usePrepareEnterAmountTransactions', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(prepareTransactions).mockImplementation(async ({ baseTransactions }) => ({
@@ -255,7 +255,7 @@ describe('usePrepareDepositAndWithdrawTransactions', () => {
   ] as const)(
     '$title',
     async ({ mode, mockResponseBody, expectedPrepareTransactionsResult, mockRefreshArgs }) => {
-      const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions(mode), {
+      const { result } = renderHook(() => usePrepareEnterAmountTransactions(mode), {
         wrapper: (component) => (
           <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
             {component?.children ? component.children : component}
@@ -283,7 +283,7 @@ describe('usePrepareDepositAndWithdrawTransactions', () => {
   )
 
   it('errors when unable to trigger shortcut error response from hooks API', async () => {
-    const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions('withdraw'), {
+    const { result } = renderHook(() => usePrepareEnterAmountTransactions('withdraw'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
@@ -302,7 +302,7 @@ describe('usePrepareDepositAndWithdrawTransactions', () => {
 
   it('errors when invalid mode is passed', async () => {
     // @ts-expect-error intentionally passing invalid mode
-    const { result } = renderHook(() => usePrepareDepositAndWithdrawTransactions('invalid-mode'), {
+    const { result } = renderHook(() => usePrepareEnterAmountTransactions('invalid-mode'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 399462375e9..7f7b273d8e4 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -93,7 +93,8 @@ export function useDepositEntrypointInfo({
   return { hasDepositToken, hasTokensOnSameNetwork, hasTokensOnOtherNetworks, canCashIn, exchanges }
 }
 
-export function usePrepareDepositAndWithdrawTransactions(
+// Called once on the EarnEnterAmountScreen.tsx and uses useAsyncCallback as it needs to be called multiples times
+export function usePrepareEnterAmountTransactions(
   mode: Extract<EarnActiveMode, 'deposit' | 'withdraw' | 'swap-deposit'>
 ) {
   const getTransactionFunction = () => {
@@ -115,7 +116,7 @@ export function usePrepareDepositAndWithdrawTransactions(
     {
       onError: (err) => {
         const error = ensureError(err)
-        Logger.error(TAG, 'usePrepareDepositAndWithdrawTransactions - Error:', error)
+        Logger.error(TAG, 'usePrepareEnterAmountTransactions - Error:', error)
       },
     }
   )
@@ -129,7 +130,8 @@ export function usePrepareDepositAndWithdrawTransactions(
   }
 }
 
-export function usePrepareClaimExitAndWithdrawTransactions(
+// Called once on the EarnConfirmationScreen.tsx so no need to use useAsyncCallback
+export function usePrepareEnterConfirmationScreenTransactions(
   mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>,
   params: {
     pool: EarnPosition
@@ -152,7 +154,7 @@ export function usePrepareClaimExitAndWithdrawTransactions(
     {
       onError: (err) => {
         const error = ensureError(err)
-        Logger.error(TAG, 'usePrepareWithdrawAndClaimTransactions', error)
+        Logger.error(TAG, 'usePrepareEnterConfirmationScreenTransactions', error)
       },
     }
   )

From 3de16cdb20bb644b0541382d5e4b517f4fede2ed Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 14:44:15 -0700
Subject: [PATCH 106/118] style(earn): rename to
 usePrepareEnterAmountTransactionsCallback

---
 src/earn/EarnEnterAmount.test.tsx | 24 ++++++++++++------------
 src/earn/EarnEnterAmount.tsx      |  4 ++--
 src/earn/hooks.test.tsx           | 10 +++++-----
 src/earn/hooks.ts                 |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 024d2f19176..bd9886399aa 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
-import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactionsCallback } from 'src/earn/hooks'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -162,7 +162,7 @@ describe('EarnEnterAmount', () => {
       .mocked(getNumberFormatSettings)
       .mockReturnValue({ decimalSeparator: '.', groupingSeparator: ',' })
     store.clearActions()
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: refreshPreparedTransactionsSpy,
       clearPreparedTransactions: jest.fn(),
@@ -214,7 +214,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -343,7 +343,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details and handle navigating to the deposit bottom sheet', async () => {
-      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: mockSwapTransaction,
@@ -443,7 +443,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should show tx details for withdrawal', async () => {
-      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -498,7 +498,7 @@ describe('EarnEnterAmount', () => {
     })
 
     it('should allow the user to set an input value over the pool balance if pricePerShare is greater than 1', async () => {
-      jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+      jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
         prepareTransactionsResult: {
           prepareTransactionsResult: mockPreparedTransaction,
           swapTransaction: undefined,
@@ -581,7 +581,7 @@ describe('EarnEnterAmount', () => {
 
   // tests independent of deposit / swap-deposit
   it('should show a warning and not allow the user to continue if they input an amount greater than balance', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -604,7 +604,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show loading spinner when preparing transaction', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: undefined,
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
@@ -677,7 +677,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should track analytics and navigate correctly when tapping cta to add gas', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransactionNotEnough,
         swapTransaction: undefined,
@@ -714,7 +714,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show the FeeDetailsBottomSheet when the user taps the fee details icon', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: undefined,
@@ -739,7 +739,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should show swap fees on the FeeDetailsBottomSheet when swap transaction is present', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
@@ -770,7 +770,7 @@ describe('EarnEnterAmount', () => {
   })
 
   it('should display swap bottom sheet when the user taps the swap details icon', async () => {
-    jest.mocked(usePrepareEnterAmountTransactions).mockReturnValue({
+    jest.mocked(usePrepareEnterAmountTransactionsCallback).mockReturnValue({
       prepareTransactionsResult: {
         prepareTransactionsResult: mockPreparedTransaction,
         swapTransaction: mockSwapTransaction,
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index bdb4ee9e60d..99d9a819dec 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -21,7 +21,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
-import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactionsCallback } from 'src/earn/hooks'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
@@ -149,7 +149,7 @@ function EarnEnterAmount({ route }: Props) {
     clearPreparedTransactions,
     prepareTransactionError,
     isPreparingTransactions,
-  } = usePrepareEnterAmountTransactions(mode)
+  } = usePrepareEnterAmountTransactionsCallback(mode)
 
   const walletAddress = useSelector(walletAddressSelector)
 
diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
index 1246557d925..2b036498aee 100644
--- a/src/earn/hooks.test.tsx
+++ b/src/earn/hooks.test.tsx
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js'
 import { FetchMock } from 'jest-fetch-mock/types'
 import React from 'react'
 import { Provider } from 'react-redux'
-import { usePrepareEnterAmountTransactions } from 'src/earn/hooks'
+import { usePrepareEnterAmountTransactionsCallback } from 'src/earn/hooks'
 import { RawShortcutTransaction } from 'src/positions/slice'
 import { ShortcutStatus } from 'src/positions/types'
 import { TokenBalance } from 'src/tokens/slice'
@@ -202,7 +202,7 @@ const expectedSwapDepositPrepareTransactionsResult = {
   },
 }
 
-describe('usePrepareEnterAmountTransactions', () => {
+describe('usePrepareEnterAmountTransactionsCallback', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(prepareTransactions).mockImplementation(async ({ baseTransactions }) => ({
@@ -255,7 +255,7 @@ describe('usePrepareEnterAmountTransactions', () => {
   ] as const)(
     '$title',
     async ({ mode, mockResponseBody, expectedPrepareTransactionsResult, mockRefreshArgs }) => {
-      const { result } = renderHook(() => usePrepareEnterAmountTransactions(mode), {
+      const { result } = renderHook(() => usePrepareEnterAmountTransactionsCallback(mode), {
         wrapper: (component) => (
           <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
             {component?.children ? component.children : component}
@@ -283,7 +283,7 @@ describe('usePrepareEnterAmountTransactions', () => {
   )
 
   it('errors when unable to trigger shortcut error response from hooks API', async () => {
-    const { result } = renderHook(() => usePrepareEnterAmountTransactions('withdraw'), {
+    const { result } = renderHook(() => usePrepareEnterAmountTransactionsCallback('withdraw'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
@@ -302,7 +302,7 @@ describe('usePrepareEnterAmountTransactions', () => {
 
   it('errors when invalid mode is passed', async () => {
     // @ts-expect-error intentionally passing invalid mode
-    const { result } = renderHook(() => usePrepareEnterAmountTransactions('invalid-mode'), {
+    const { result } = renderHook(() => usePrepareEnterAmountTransactionsCallback('invalid-mode'), {
       wrapper: (component) => (
         <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
           {component?.children ? component.children : component}
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 7f7b273d8e4..aafcd158a1e 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -94,7 +94,7 @@ export function useDepositEntrypointInfo({
 }
 
 // Called once on the EarnEnterAmountScreen.tsx and uses useAsyncCallback as it needs to be called multiples times
-export function usePrepareEnterAmountTransactions(
+export function usePrepareEnterAmountTransactionsCallback(
   mode: Extract<EarnActiveMode, 'deposit' | 'withdraw' | 'swap-deposit'>
 ) {
   const getTransactionFunction = () => {

From 34420b9cd750c54a95c9ecfc118b1c87e9ad817c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 14:54:21 -0700
Subject: [PATCH 107/118] style(earn): use ternary and remove curry

---
 src/earn/hooks.test.tsx | 15 ---------------
 src/earn/hooks.ts       | 16 +++-------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/earn/hooks.test.tsx b/src/earn/hooks.test.tsx
index 2b036498aee..ec4423a82ea 100644
--- a/src/earn/hooks.test.tsx
+++ b/src/earn/hooks.test.tsx
@@ -299,19 +299,4 @@ describe('usePrepareEnterAmountTransactionsCallback', () => {
       new Error('Unable to trigger shortcut: 500 Internal Server Error')
     )
   })
-
-  it('errors when invalid mode is passed', async () => {
-    // @ts-expect-error intentionally passing invalid mode
-    const { result } = renderHook(() => usePrepareEnterAmountTransactionsCallback('invalid-mode'), {
-      wrapper: (component) => (
-        <Provider store={getMockStoreWithShortcutStatus('success', transactions)}>
-          {component?.children ? component.children : component}
-        </Provider>
-      ),
-    })
-
-    await expect(result.current.refreshPreparedTransactions(mockRefreshArgs)).rejects.toEqual(
-      new Error('Invalid mode: invalid-mode')
-    )
-  })
 })
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index aafcd158a1e..f5577a5d854 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -97,21 +97,11 @@ export function useDepositEntrypointInfo({
 export function usePrepareEnterAmountTransactionsCallback(
   mode: Extract<EarnActiveMode, 'deposit' | 'withdraw' | 'swap-deposit'>
 ) {
-  const getTransactionFunction = () => {
-    switch (mode) {
-      case 'deposit':
-      case 'swap-deposit':
-        return prepareDepositTransactions
-      case 'withdraw':
-        return prepareWithdrawTransactionsWithSwap
-      default:
-        throw new Error(`Invalid mode: ${mode}`)
-    }
-  }
-
   const prepareTransactions = useAsyncCallback(
     async (args) => {
-      return getTransactionFunction()(args)
+      return mode === 'withdraw'
+        ? prepareWithdrawTransactionsWithSwap(args)
+        : prepareDepositTransactions(args)
     },
     {
       onError: (err) => {

From 502a676148bbc2a0e3c217baa195907330415dd2 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 1 Nov 2024 15:45:39 -0700
Subject: [PATCH 108/118] test(earn) partial withdrawals don't include rewards
 by default

---
 src/earn/EarnConfirmationScreen.test.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 77809415a69..438385adfac 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -183,6 +183,7 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
     expect(store.getActions()).toEqual([])
   })
 

From 2c5c4c55ad220427fd87cfaaf1f732430d6ff3d4 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Sat, 2 Nov 2024 00:02:02 -0700
Subject: [PATCH 109/118] docs(earn): describe hook calls and tx preperation

---
 src/earn/hooks.ts               | 4 ++--
 src/earn/prepareTransactions.ts | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index f5577a5d854..5c3c4d586fb 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -93,7 +93,7 @@ export function useDepositEntrypointInfo({
   return { hasDepositToken, hasTokensOnSameNetwork, hasTokensOnOtherNetworks, canCashIn, exchanges }
 }
 
-// Called once on the EarnEnterAmountScreen.tsx and uses useAsyncCallback as it needs to be called multiples times
+// Used on EarnEnterAmount.tsx with on user input with a debounced callback
 export function usePrepareEnterAmountTransactionsCallback(
   mode: Extract<EarnActiveMode, 'deposit' | 'withdraw' | 'swap-deposit'>
 ) {
@@ -120,7 +120,7 @@ export function usePrepareEnterAmountTransactionsCallback(
   }
 }
 
-// Called once on the EarnConfirmationScreen.tsx so no need to use useAsyncCallback
+// Used on the EarnConfirmationScreen.tsx called once on load
 export function usePrepareEnterConfirmationScreenTransactions(
   mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>,
   params: {
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 13d4fdb5579..dafc378e517 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -16,7 +16,7 @@ import { Address } from 'viem'
 
 const TAG = 'earn/prepareTransactions'
 
-// Used on the EarnEnterAmount.tsx Screen
+// Used on EarnEnterAmount.tsx
 export async function prepareDepositTransactions({
   amount,
   token,
@@ -92,6 +92,7 @@ export async function prepareDepositTransactions({
   }
 }
 
+// Used on EarnEnterAmount.tsx and the usePrepareEnterAmountTransactionsCallback hook expects a swapTransaction even if it's undefined
 export async function prepareWithdrawTransactionsWithSwap({
   amount,
   walletAddress,

From 8cffb5b8d2fcf4f24c47502d866e4a59c6c8a8f8 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Sat, 2 Nov 2024 00:08:20 -0700
Subject: [PATCH 110/118] refactor(earn): avoid code duplication in tx
 preperation

---
 src/earn/prepareTransactions.ts | 40 +++++++++++----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index dafc378e517..4facb0526b3 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -101,43 +101,29 @@ export async function prepareWithdrawTransactionsWithSwap({
   hooksApiUrl,
   useMax,
 }: {
-  amount?: string
+  amount: string
   walletAddress: Address
   feeCurrencies: TokenBalance[]
   pool: EarnPosition
   hooksApiUrl: string
-  useMax?: boolean
+  useMax: boolean
 }) {
-  const { appId, balance, dataProps, networkId, shortcutTriggerArgs } = pool
-  const { transactions: withdrawTransactions }: { transactions: RawShortcutTransaction[] } =
-    await triggerShortcutRequest(hooksApiUrl, {
-      address: walletAddress,
-      appId,
-      networkId,
-      shortcutId: 'withdraw',
-      tokens: [
-        {
-          tokenId: dataProps.withdrawTokenId,
-          amount: useMax ? balance : amount,
-          useMax,
-        },
-      ],
-      ...shortcutTriggerArgs?.withdraw,
-    })
+  const prepareTransactionsResult = await prepareWithdrawTransactions({
+    amount,
+    walletAddress,
+    feeCurrencies,
+    pool,
+    hooksApiUrl,
+    useMax,
+  })
+
   Logger.debug(TAG, 'prepareWithdrawTransactionsWithSwap', {
-    withdrawTransactions,
+    prepareTransactionsResult,
     pool,
   })
 
-  // Is there a better way to do this?
-  // Pass a param to a shared prepareTransactions function to indicate that the transaction should also return swapTransaction:
   return {
-    prepareTransactionsResult: await prepareTransactions({
-      feeCurrencies,
-      baseTransactions: rawShortcutTransactionsToTransactionRequests(withdrawTransactions),
-      isGasSubsidized: isGasSubsidizedForNetwork(networkId),
-      origin: 'earn-withdraw',
-    }),
+    prepareTransactionsResult,
     swapTransaction: undefined,
   }
 }

From d5ee3e83ad99ec61f2363da039f64902955fb708 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 4 Nov 2024 17:25:22 -0800
Subject: [PATCH 111/118] style: remove unneeded boolean coercion

---
 src/earn/EarnConfirmationScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 859ff3e5707..7973753a1e0 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -88,7 +88,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     feeCurrencies,
     hooksApiUrl,
     rewardsPositions,
-    useMax: !!useMax,
+    useMax,
   })
 
   const onPress = () => {

From 3f2f2d1cb98dd01a933e83fb07873446543e0140 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 4 Nov 2024 17:25:52 -0800
Subject: [PATCH 112/118] docs: remove superfluous comments

---
 src/earn/prepareTransactions.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 4facb0526b3..06f07260d8e 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -159,7 +159,6 @@ export async function prepareWithdrawAndClaimTransactions({
       ...shortcutTriggerArgs?.withdraw,
     })
 
-  // Prepare the claim transactions if there are rewards positions
   const claimTransactions = await Promise.all(
     rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
       const { transactions }: { transactions?: RawShortcutTransaction[] } =
@@ -249,7 +248,6 @@ export async function prepareClaimTransactions({
 }) {
   const { appId, networkId } = pool
 
-  // Prepare the claim transactions if there are rewards positions
   const claimTransactions = await Promise.all(
     rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
       const { transactions }: { transactions?: RawShortcutTransaction[] } =

From a65343a36aa1609ff4ae4008a1936b92cc361f4e Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 5 Nov 2024 18:15:13 -0800
Subject: [PATCH 113/118] pref(earn): avoid preparing transaction that could go
 unused

---
 src/earn/prepareTransactions.ts | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 06f07260d8e..9c9be4bd627 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -159,19 +159,23 @@ export async function prepareWithdrawAndClaimTransactions({
       ...shortcutTriggerArgs?.withdraw,
     })
 
-  const claimTransactions = await Promise.all(
-    rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
-      const { transactions }: { transactions?: RawShortcutTransaction[] } =
-        await triggerShortcutRequest(hooksApiUrl, {
-          address: walletAddress,
-          appId,
-          networkId,
-          shortcutId: 'claim-rewards',
-          ...position.shortcutTriggerArgs?.['claim-rewards'],
+  // Conditionally populate claimTransactions based on withdrawalIncludesClaim
+  const claimTransactions = dataProps.withdrawalIncludesClaim
+    ? []
+    : await Promise.all(
+        rewardsPositions.map(async (position): Promise<RawShortcutTransaction[]> => {
+          const { transactions }: { transactions?: RawShortcutTransaction[] } =
+            await triggerShortcutRequest(hooksApiUrl, {
+              address: walletAddress,
+              appId,
+              networkId,
+              shortcutId: 'claim-rewards',
+              ...position.shortcutTriggerArgs?.['claim-rewards'],
+            })
+          return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
         })
-      return transactions ?? [] // Default to an empty array if rewardsPositions is undefined
-    })
-  )
+      )
+
   Logger.debug(TAG, 'prepareWithdrawAndClaimTransactions', {
     withdrawTransactions,
     claimTransactions,
@@ -182,7 +186,7 @@ export async function prepareWithdrawAndClaimTransactions({
     feeCurrencies,
     baseTransactions: rawShortcutTransactionsToTransactionRequests([
       ...withdrawTransactions,
-      ...(dataProps.withdrawalIncludesClaim ? [] : claimTransactions.flat()),
+      ...claimTransactions.flat(),
     ]),
     isGasSubsidized: isGasSubsidizedForNetwork(networkId),
     origin: 'earn-withdraw',

From 47787a8b084e759a52ca1d9d2bd103cbab2f43ac Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 5 Nov 2024 18:17:39 -0800
Subject: [PATCH 114/118] test(earn): no claim tx included
 withdrawalIncludesClaim is true

---
 src/earn/prepareTransactions.test.ts | 61 +++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 78c985b88ba..446a7924f30 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -269,7 +269,7 @@ describe('prepareTransactions', () => {
             },
           ],
         })
-        .mockResolvedValueOnce({
+        .mockResolvedValue({
           transactions: [
             {
               from: '0x1234',
@@ -393,6 +393,65 @@ describe('prepareTransactions', () => {
         ],
       })
     })
+
+    it('prepares only withdraw transaction if withdrawalIncludesClaim is true', async () => {
+      const result = await prepareWithdrawAndClaimTransactions({
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        pool: {
+          ...mockEarnPositions[0],
+          dataProps: { ...mockEarnPositions[0].dataProps, withdrawalIncludesClaim: true },
+        },
+        hooksApiUrl: 'https://hooks.api',
+        rewardsPositions: [
+          {
+            ...mockRewardsPositions[0],
+            shortcutTriggerArgs: { 'claim-rewards': { positionAddress: '0x123' } },
+          },
+        ],
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x123',
+          to: '0x567',
+          data: '0xencodedData',
+          gas: BigInt(50200),
+          _estimatedGasUse: BigInt(49900),
+        },
+      ]
+      expect(result).toEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
+      })
+
+      expect(isGasSubsidizedForNetwork).toHaveBeenCalledWith(mockEarnPositions[0].networkId)
+
+      expect(prepareTransactions).toHaveBeenCalledTimes(1)
+      expect(prepareTransactions).toHaveBeenCalledWith({
+        baseTransactions: expectedTransactions,
+        feeCurrencies: [mockFeeCurrency],
+        isGasSubsidized: false,
+        origin: 'earn-withdraw',
+      })
+
+      expect(triggerShortcutRequest).toHaveBeenCalledTimes(1)
+      expect(triggerShortcutRequest).toHaveBeenNthCalledWith(1, 'https://hooks.api', {
+        address: '0x1234',
+        appId: 'aave',
+        networkId: NetworkId['arbitrum-sepolia'],
+        shortcutId: 'withdraw',
+        tokenDecimals: 6,
+        tokens: [
+          {
+            tokenId: 'arbitrum-sepolia:0x460b97bd498e1157530aeb3086301d5225b91216',
+            amount: '0',
+            useMax: true,
+          },
+        ],
+      })
+    })
   })
 
   describe('prepareWithdrawTransaction', () => {

From 26316f89a7e4947617fa7a1a01659e44823bb167 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 5 Nov 2024 21:00:27 -0800
Subject: [PATCH 115/118] test(earn): tx prep called with correct args

---
 src/earn/EarnConfirmationScreen.test.tsx | 82 +++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 438385adfac..7204015b723 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -20,10 +20,11 @@ import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore } from 'test/utils'
+import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
   mockAaveArbUsdcTokenId,
+  mockAccount,
   mockArbArbTokenId,
   mockArbEthTokenId,
   mockArbUsdcTokenId,
@@ -114,7 +115,8 @@ describe('EarnConfirmationScreen', () => {
           component={EarnConfirmationScreen}
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
-            mode: 'Exit',
+            mode: 'exit',
+            useMax: true,
           }}
         />
       </Provider>
@@ -148,10 +150,21 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      rewardsPositions: [mockRewardsPositions[1]],
+      walletAddress: mockAccount.toLowerCase(),
+      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
+      amount: '10.75',
+      useMax: true,
+    })
     expect(store.getActions()).toEqual([])
   })
 
   it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
+    const inputAmount = (10.75 * +mockEarnPositions[0].pricePerShare) / 2 // Input amount is half of the balance
+    const txAmount = '5.37500000000000045455' // inputAmount * pricePerShare but with more precision
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -159,7 +172,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
             mode: 'withdraw',
-            inputAmount: (10.75 * +mockEarnPositions[0].pricePerShare) / 2, // Input amount is half of the balance
+            inputAmount,
           }}
         />
       </Provider>
@@ -183,10 +196,64 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
     expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(prepareWithdrawTransactions).toHaveBeenCalledWith({
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      rewardsPositions: [mockRewardsPositions[1]],
+      walletAddress: mockAccount.toLowerCase(),
+      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
+      amount: txAmount,
+    })
     expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
     expect(store.getActions()).toEqual([])
   })
 
+  it('renders rewards and gas after fetching rewards and preparing tx for claim rewards', async () => {
+    const { getByText, getByTestId, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnConfirmationScreen}
+          params={{
+            pool: { ...mockEarnPositions[0], balance: '10.75' },
+            mode: 'claim-rewards',
+            useMax: true,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.titleClaim')).toBeTruthy()
+    expect(getByTestId('EarnConfirmation/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
+
+    expect(getByText('earnFlow.collect.reward')).toBeTruthy()
+    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
+      '0.01 ARB'
+    )
+    expect(getByTestId(`EarnConfirmation/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent(
+      '₱0.016'
+    )
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnConfirmation/GasLoading')).toBeFalsy()
+    })
+
+    expect(getByTestId('EarnConfirmation/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
+    expect(getByTestId('EarnConfirmation/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
+    expect(queryByTestId('EarnConfirmation/GasSubsidized')).toBeFalsy()
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeEnabled()
+    expect(prepareClaimTransactions).toHaveBeenCalledWith({
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      pool: { ...mockEarnPositions[0], balance: '10.75' },
+      walletAddress: mockAccount.toLowerCase(),
+      hooksApiUrl: 'https://api.alfajores.valora.xyz/hooks-api',
+      amount: '10.75',
+      useMax: true,
+      rewardsPositions: [mockRewardsPositions[1]],
+    })
+    expect(store.getActions()).toEqual([])
+  })
+
   it('skips rewards section when no rewards', async () => {
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider
@@ -206,6 +273,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -219,6 +287,7 @@ describe('EarnConfirmationScreen', () => {
     expect(getByTestId(`EarnConfirmation/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent(
       '₱15.73'
     )
+    expect(getByTestId('EarnConfirmationScreen/CTA')).toBeDisabled()
 
     expect(queryByText('earnFlow.collect.reward')).toBeFalsy()
     expect(queryByTestId(`EarnConfirmation/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
@@ -240,6 +309,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -270,6 +340,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -294,6 +365,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: { ...mockEarnPositions[0], balance: '10.75' },
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -344,6 +416,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -371,6 +444,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -411,6 +485,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode: 'withdraw',
+            useMax: true,
           }}
         />
       </Provider>
@@ -430,6 +505,7 @@ describe('EarnConfirmationScreen', () => {
           params={{
             pool: mockEarnPositions[0],
             mode,
+            useMax: true,
           }}
         />
       </Provider>

From c0c64fec67eaf7dd92fa3c9897d906aacdd834d1 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 5 Nov 2024 21:00:57 -0800
Subject: [PATCH 116/118] style(earn): add awaits in useAsync

---
 src/earn/hooks.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 5c3c4d586fb..ccf3c8c0bf5 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -134,12 +134,12 @@ export function usePrepareEnterConfirmationScreenTransactions(
   }
 ) {
   return useAsync(
-    () =>
+    async () =>
       mode === 'claim-rewards'
-        ? prepareClaimTransactions(params)
+        ? await prepareClaimTransactions(params)
         : mode === 'exit'
-          ? prepareWithdrawAndClaimTransactions(params)
-          : prepareWithdrawTransactions(params),
+          ? await prepareWithdrawAndClaimTransactions(params)
+          : await prepareWithdrawTransactions(params),
     [],
     {
       onError: (err) => {

From c85042936f70a25fa0b60853491e513d11ff131a Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 6 Nov 2024 02:30:18 -0800
Subject: [PATCH 117/118] test(earn): update comment

---
 src/earn/EarnConfirmationScreen.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/earn/EarnConfirmationScreen.test.tsx b/src/earn/EarnConfirmationScreen.test.tsx
index 7204015b723..5fd16314a0b 100644
--- a/src/earn/EarnConfirmationScreen.test.tsx
+++ b/src/earn/EarnConfirmationScreen.test.tsx
@@ -164,7 +164,7 @@ describe('EarnConfirmationScreen', () => {
 
   it('renders total balance, rewards and gas after fetching rewards and preparing tx for partial withdrawal', async () => {
     const inputAmount = (10.75 * +mockEarnPositions[0].pricePerShare) / 2 // Input amount is half of the balance
-    const txAmount = '5.37500000000000045455' // inputAmount * pricePerShare but with more precision
+    const txAmount = '5.37500000000000045455' // inputAmount divided by pricePerShare but with more precision
     const { getByText, getByTestId, queryByTestId, queryByText } = render(
       <Provider store={store}>
         <MockedNavigator

From d1558f3e935968571b4b2e54528fb0f1de204535 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 7 Nov 2024 14:00:36 -0800
Subject: [PATCH 118/118] style(earn): rename hook to
 usePrepareEarnConfirmationScreenTransactions

---
 src/earn/EarnConfirmationScreen.tsx | 4 ++--
 src/earn/hooks.ts                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/earn/EarnConfirmationScreen.tsx b/src/earn/EarnConfirmationScreen.tsx
index 7973753a1e0..de9d65d2d8b 100644
--- a/src/earn/EarnConfirmationScreen.tsx
+++ b/src/earn/EarnConfirmationScreen.tsx
@@ -10,7 +10,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import { usePrepareEnterConfirmationScreenTransactions } from 'src/earn/hooks'
+import { usePrepareEarnConfirmationScreenTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { EarnActiveMode } from 'src/earn/types'
@@ -81,7 +81,7 @@ export default function EarnConfirmationScreen({ route }: Props) {
     result: prepareTransactionsResult,
     loading: isPreparingTransactions,
     error: prepareTransactionError,
-  } = usePrepareEnterConfirmationScreenTransactions(mode, {
+  } = usePrepareEarnConfirmationScreenTransactions(mode, {
     amount: withdrawAmountInDepositToken.dividedBy(pool.pricePerShare[0]).toString(),
     pool,
     walletAddress,
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index ccf3c8c0bf5..8c67551343d 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -121,7 +121,7 @@ export function usePrepareEnterAmountTransactionsCallback(
 }
 
 // Used on the EarnConfirmationScreen.tsx called once on load
-export function usePrepareEnterConfirmationScreenTransactions(
+export function usePrepareEarnConfirmationScreenTransactions(
   mode: Extract<EarnActiveMode, 'claim-rewards' | 'exit' | 'withdraw'>,
   params: {
     pool: EarnPosition
@@ -144,7 +144,7 @@ export function usePrepareEnterConfirmationScreenTransactions(
     {
       onError: (err) => {
         const error = ensureError(err)
-        Logger.error(TAG, 'usePrepareEnterConfirmationScreenTransactions', error)
+        Logger.error(TAG, 'usePrepareEarnConfirmationScreenTransactions', error)
       },
     }
   )