diff --git a/.env b/.env
index 4dd4f90ced3..859d961f7c0 100644
--- a/.env
+++ b/.env
@@ -12,9 +12,6 @@ VITE_FEATURE_MAYACHAIN=true
 VITE_FEATURE_BASE=true
 VITE_FEATURE_OPTIMISM=true
 VITE_FEATURE_ZCASH=true
-VITE_FEATURE_SAVERS_VAULTS=true
-VITE_FEATURE_SAVERS_VAULTS_DEPOSIT=false
-VITE_FEATURE_SAVERS_VAULTS_WITHDRAW=false
 VITE_FEATURE_WALLET_CONNECT_TO_DAPPS_V2=true
 VITE_FEATURE_WALLET_CONNECT_TO_DAPPS=true
 VITE_FEATURE_ADVANCED_SLIPPAGE=true
@@ -23,9 +20,6 @@ VITE_FEATURE_TREZOR_WALLET=true
 VITE_FEATURE_VULTISIG_WALLET=true
 VITE_FEATURE_WALLET_CONNECT_V2=true
 VITE_FEATURE_WC_DIRECT_CONNECTION=false
-VITE_FEATURE_THORCHAIN_LENDING=true
-VITE_FEATURE_THORCHAIN_LENDING_BORROW=false
-VITE_FEATURE_THORCHAIN_LENDING_REPAY=false
 VITE_FEATURE_THORCHAINSWAP_LONGTAIL=true
 VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL=true
 VITE_FEATURE_THORCHAIN_LP=true
diff --git a/src/Routes/RoutesCommon.tsx b/src/Routes/RoutesCommon.tsx
index 20e9854772b..372ed36451a 100644
--- a/src/Routes/RoutesCommon.tsx
+++ b/src/Routes/RoutesCommon.tsx
@@ -118,16 +118,6 @@ const Explore = makeSuspenseful(
   true,
 )
 
-const LendingPage = makeSuspenseful(
-  lazy(() =>
-    import('@/pages/Lending/LendingPage').then(({ LendingPage }) => ({
-      default: LendingPage,
-    })),
-  ),
-  {},
-  true,
-)
-
 const PoolsPage = makeSuspenseful(
   lazy(() =>
     import('@/pages/ThorChainLP/PoolsPage').then(({ PoolsPage }) => ({
@@ -383,20 +373,6 @@ export const routes: Route[] = [
     mobileNav: false,
     disable: !getConfig().VITE_FEATURE_THORCHAIN_LP,
   },
-  {
-    path: '/lending/*',
-    label: getConfig().VITE_FEATURE_CHAINFLIP_LENDING
-      ? 'navBar.thorchainLending'
-      : 'navBar.lending',
-    icon: <RiExchangeFundsLine />,
-    main: LendingPage,
-    category: RouteCategory.Thorchain,
-    priority: 2,
-    mobileNav: false,
-    disable: !getConfig().VITE_FEATURE_THORCHAIN_LENDING,
-    isViewOnly: true,
-    isDeprecated: getConfig().VITE_FEATURE_CHAINFLIP_LENDING,
-  },
   {
     path: '/chainflip-lending/*',
     label: 'navBar.chainflipLending',
diff --git a/src/assets/savers-vault-top.png b/src/assets/runepool-top.png
similarity index 100%
rename from src/assets/savers-vault-top.png
rename to src/assets/runepool-top.png
diff --git a/src/assets/translations/de/main.json b/src/assets/translations/de/main.json
index 8bbbbe1f817..67daf405b76 100644
--- a/src/assets/translations/de/main.json
+++ b/src/assets/translations/de/main.json
@@ -602,36 +602,18 @@
         "claimNow": "jetzt Einfordern",
         "claimYour": "Fordern Sie Ihre %{opportunity} an"
       },
-      "saversVaults": {
-        "description": "Verdienen Sie Rendite auf Ihr %{asset} durch die THORChain Savers Vaults. Es gibt keine Sperrzeit und Belohnungen werden automatisch angesammelt. Die Rendite auf THORChain ergibt sich aus Swap-Gebühren und Blockbelohnungen. Die einseitige Rendite ist auf die Hälfte der doppelseitigen Rendite der Liquiditätsanbieter begrenzt.",
-        "runePoolDescription": "Mit RUNEPool können Sie mehr %{asset} verdienen, indem Sie Ihr %{asset} mit anderen bündeln. Sie müssen keine bestimmten Pools auswählen, alle sind an der Gesamtleistung beteiligt.",
-        "runePoolOverviewDescription": "RUNEPool optimiert die RUNE Nutzung, indem es in alle POL-fähigen Liquiditätspools in THORChain eingezahlt wird. Durch das Pooling von RUNE in diesen Pools verdienen die Teilnehmer den kombinierten APY, sind jedoch dem gesamten vorübergehenden Verlust ausgesetzt. Anstatt einzelne Pools auszuwählen, profitieren Benutzer von der Gesamtleistung und investieren effektiv in einen RUNE-Index und alle POL-fähigen THORChain-Vermögenswerte. Dies vereinfacht die Liquiditätsbereitstellung und reduziert das individuelle Risiko.",
-        "vaultCap": "Tresorobergrenze",
-        "vaultCapTooltip": "Akt. max. Kapazität für diesen Tresor",
+      "runePool": {
+        "description": "Mit RUNEPool können Sie mehr %{asset} verdienen, indem Sie Ihr %{asset} mit anderen bündeln. Sie müssen keine bestimmten Pools auswählen, alle sind an der Gesamtleistung beteiligt.",
+        "overviewDescription": "RUNEPool optimiert die RUNE Nutzung, indem es in alle POL-fähigen Liquiditätspools in THORChain eingezahlt wird. Durch das Pooling von RUNE in diesen Pools verdienen die Teilnehmer den kombinierten APY, sind jedoch dem gesamten vorübergehenden Verlust ausgesetzt. Anstatt einzelne Pools auszuwählen, profitieren Benutzer von der Gesamtleistung und investieren effektiv in einen RUNE-Index und alle POL-fähigen THORChain-Vermögenswerte. Dies vereinfacht die Liquiditätsbereitstellung und reduziert das individuelle Risiko.",
+        "introducing": "Einführung in RUNEPool",
+        "agree": "Mir ist bewusst, dass bei RUNEPool eine Mindestsperrfrist von 30 Tagen besteht und ein erhöhtes Risiko eines vorübergehenden Verlusts besteht.",
         "haltedDepositTitle": "Einzahlungen sind vorübergehend gestoppt.",
         "disabledDepositTitle": "Einzahlungen sind vorübergehend deaktiviert.",
         "disabledWithdrawTitle": "Auszahlungen sind vorübergehend deaktiviert.",
         "withdrawLockedTitle": "Sie müssen %{timeHuman} warten, um abzuheben.",
-        "haltedDescription": "Bitte twittern Sie an @THORChain, um die Obergrenzen zu erhöhen!",
-        "protocolFee": "Protokollgebühr",
-        "dustAmount": "Kleinbetrag",
-        "dustAmountTooltip": "Ein Kleinbetrag ist erforderlich, um Ihre Adresse zu identifizieren, und wird für die spätere Verwendung reserviert, wenn Sie eine Auszahlung vornehmen möchten",
-        "sendDustBody": "Sie müssen einen Kleinbetrag an diese Adresse senden, um Abheben zu können.",
-        "sendDust": "Sende Kleinbetrag",
-        "addressToSendTo": "an diese Adresse senden",
-        "introducingSaversVaults": "Einführung von Savers Vaults",
-        "introducingRunePool": "Einführung in RUNEPool",
-        "risksBody": {
-          "vaults": "In Bezug auf <link>diesen Artikel</link> für Risiken im Zusammenhang mit Savers Vaults.",
-          "runePool": "In Bezug auf <link>diesen Artikel</link> für die mit RUNEPool verbundenen Risiken."
-        },
-        "timeToBreakEven": {
-          "title": "Zeit zum Break-Even",
-          "tooltip": "Geschätzte Zeit zur Deckung von Einzahlungsgebühren und Einnahmen."
-        },
         "cannotDepositWhilePendingTx": "Kann nicht einzahlen, während Txs ausstehen",
         "cannotWithdrawWhilePendingTx": "Kann nicht auszahlen, während Txs ausstehen",
-        "agreeRunePool": "Mir ist bewusst, dass bei RUNEPool eine Mindestsperrfrist von 30 Tagen besteht und ein erhöhtes Risiko eines vorübergehenden Verlusts besteht."
+        "risksBody": "In Bezug auf <link>diesen Artikel</link> für die mit RUNEPool verbundenen Risiken."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Limit Bestellungen",
     "buyCrypto": "Krypto kaufen/verkaufen",
     "buyCryptoShort": "Kauf/Verkauf",
-    "lending": "Verleihen",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Pools",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Benutzerdefiniert"
   },
   "lending": {
-    "lending": "Verleihen",
-    "repaymentAvailable": "Rückzahlung möglich",
-    "repaymentUnavailable": "Rückzahlung noch nicht möglich",
-    "daysUntilRepayment": "%{numDays} Tage bis zur Rückzahlung",
-    "repaymentDays": "%{numDays} Tage",
-    "lendingBody": "Eine Auflistung aller Pools, die zinslos und ohne Liquidation ausgeliehen werden können.",
-    "collateralValue": "Sicherheitenwert",
-    "collateralValueDescription": "Aktueller Vermögenswert, der als Sicherheit dient",
-    "debtValue": "Schuldenwert",
-    "loanToValue": "Beleihungswert",
-    "availablePools": "Verfügbare Pools",
-    "pool": "Pool",
-    "poolDepth": "Pooltiefe",
-    "poolDepthDescription": "Die Gesundheit des Pools",
-    "status": "Status",
-    "statusDescription": "Der Status des Pools",
-    "totalDebtBalance": "Gesamtschuldensaldo",
-    "totalDebtBalanceDescription": "Kumulierter Schuldenstand im Lending-pool",
-    "totalCollateral": "Gesamtsicherheiten",
-    "totalCollateralDescription": "Gesamte dem Lending-pool hinzugefügte Sicherheiten",
-    "estCollateralizationRatio": "zirka Besicherungsverhältnis",
-    "estCollateralizationRatioDescription": "Derzeit gilt eine pauschale Besicherungsquote von 200 %. Zukünftig wird eine dynamische Quote je nach Marktbedingungen einen Ausgleich zwischen der maximalen und minimalen Besicherungsquote schaffen.",
-    "collateralizationRatio": "Besicherungsverhältnis",
-    "totalBorrowers": "Gesamtzahl der Kreditnehmer",
-    "totalBorrowersDescription": "Anzahl der teilnehmenden Kreditnehmer",
-    "myLoanInformation": "Meine Kreditinformationen",
-    "loanInformation": "Kreditübersicht",
-    "poolInformation": "Pool Information",
-    "collateralBalance": "Sicherheitensaldo",
-    "collateralBalanceDescription": "Gesamtbetrag Ihres Vermögenswertes, der derzeit als Sicherheit gehalten wird",
-    "debtBalance": "Schuldenstand",
-    "debtBalanceDescription": "Gesamtbetrag der Schulden, die Sie für dieses Darlehen schulden",
-    "repaymentLock": "Rückzahlungssperre",
-    "repaymentLockDescription": "Mindestlaufzeit, bevor Sie Ihr Darlehen zurückzahlen können",
-    "receiveCollateral": "Der Betrag der Sicherheit, den Sie zurückerhalten",
-    "borrow": "Ausleihen",
-    "repay": "Zurückzahlen",
-    "repayAmount": "Rückzahlungsbetrag",
-    "unlocked": "Entsperrt",
-    "unlockedCollateral": "Freigeschaltete Sicherheiten",
-    "depositAsset": "Einzahlen von %{asset}",
     "switchAssets": "Vermögenswerte wechseln",
-    "outstandingDebt": "Restschuld",
-    "outstandingDebtDescription": "Die Höhe der von Ihnen geliehenen Sicherheiten",
-    "collateral": "Sicherheit",
-    "debt": "Schulden",
-    "healthy": "Die Tiefe ist optimal, die Kredite sind effizient.",
-    "confirmAndBorrow": "Bestätigen und ausleihen",
-    "confirmAndRepay": "Bestätigen und zurückzahlen",
-    "borrowAgain": "Nochmals ausleihen",
-    "repayAgain": "Nochmals zurückzahlen",
-    "transactionInfo": "Transaktionsübersicht",
-    "repayNoticeTitle": "Halten!",
-    "repayNoticeCta": "Ich verstehe",
-    "repayNotice": "Um Ihre Sicherheiten zurückzuerhalten, müssen Sie 100 % Ihrer Schulden zurückzahlen.",
-    "feesNotice": "Für die Sicherheiten, die Sie nach vollständiger Rückzahlung Ihrer Schulden zurückerhalten, fallen Gebühren an",
-    "refetchQuote": "Angebot erneut abrufen",
-    "haltedAlert": "THORFi Dienste (Lending, Savers und RUNEPool) sind derzeit auf THORChain pausiert. Wir entschuldigen uns für etwaige Unannehmlichkeiten.",
-    "faq": {
-      "title": "FAQ",
-      "lending": {
-        "title": "Was ist THORChain Lending?",
-        "body": "Die Kreditvergabe ermöglicht es Benutzern, native Sicherheiten zu hinterlegen und dann eine Schuld mit einer Besicherungsquote (CR) zu schaffen. Die Schulden lauten immer auf USD (auch bekannt als TOR), unabhängig davon, welchen L1 Vermögenswert der Benutzer erhält"
-      },
-      "borrowing": {
-        "title": "Wie funktioniert die Kreditaufnahme?",
-        "body": "Bei der Kreditaufnahme in THORChain nutzen Sie Ihr hinterlegtes Vermögen als Sicherheit für die Aufnahme eines Kredits. Das Darlehen lautet auf USD (TOR) und kann in verschiedenen L1 Vermögenswerten aufgenommen werden. Mit einer dynamischen Besicherungsquote können Sie flexibel Kredite aufnehmen, ohne sich um Zinsen oder Liquidation sorgen zu müssen"
-      },
-      "repayments": {
-        "title": "Wie funktioniert die Rückzahlung?",
-        "body": "Die Rückzahlung in THORChain ist flexibel und ermöglicht Ihnen die Rückzahlung jederzeit nach Ablauf Ihrer Rückzahlungssperre und in jedem Vermögenswert, der dann in TOR umgewandelt wird. Der Rückzahlungsbetrag wird von Ihrem Schuldensaldo abgezogen und die anteilige Sicherheit wird Ihnen bei vollständiger Rückzahlung wieder freigegeben"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Rückzahlungen sind vorübergehend gestoppt.",
-      "borrowingHalted": "Ausleihen ist vorübergehend gestoppt.",
-      "repaymentsDisabled": "Rückzahlungen sind vorübergehend deaktiviert.",
-      "borrowingDisabled": "Ausleihen ist vorübergehend deaktiviert.",
-      "amountTooLowToReturnCollateral": "Betrag zu niedrig, um Sicherheiten zurückzugeben",
-      "amountTooLowToReturnCollateralTooltip": "Die Rückzahlung ist zu niedrig, um Ihre Sicherheiten zurückzuerhalten. Bitte versuchen Sie es erneut mit einem höheren Betrag oder zahlen Sie einen Teilbetrag zurück (wodurch Sie Ihre Sicherheiten nicht zurückerhalten, Ihre Schulden jedoch verringern).",
-      "amountTooSmallUnknownMinimumTooltip": "Der von Ihnen eingegebene Rückzahlungsbetrag ist zu gering. Bitte versuchen Sie es erneut mit einem höheren Betrag.",
-      "repaymentUnavailableTooltip": "Eine Rückzahlung Ihres Kredites ist derzeit nicht möglich. Bitte warten Sie, bis die Rückzahlungssperre abgelaufen ist.",
-      "repaymentsHaltedTooltip": "Die Rückzahlungen sind vorübergehend ausgesetzt. Bitte versuchen Sie es später noch einmal."
-    },
-    "quote": {
-      "collateral": "Gesamtvermögenswert, der gegen Ihr Darlehen besichert wird",
-      "debt": "Gesamtschulden, die Sie basierend auf Ihrem neuen Kreditbetrag schulden",
-      "repaymentLock": "Mindestlaufzeit, bevor Sie Ihr Darlehen zurückzahlen können",
-      "collateralizationRatio": "Verhältnis Ihres Sicherheitenwertes zum Kreditbetrag",
-      "feesPlusSlippage": "Es fielen insgesamt Gebühren an, einschließlich L1 Gebühren, Slippage und THORChain-Liquiditätsgebühren"
-    },
-    "yourLoans": {
-      "yourLoans": "Ihre Kredite",
-      "emptyTitle": "Das Land der Nullkredite!",
-      "emptyBody": "Offenbar haben Sie im Moment keine Kredite. Ist das ein finanzieller Zen-Zauber oder nur eine Pause vor Ihrem nächsten großen Kreditabenteuer? Wie auch immer, genießen Sie die Ruhe!"
-    }
+    "poolInformation": "Pool Information"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Bestätigung ausstehend",
@@ -2970,7 +2856,8 @@
         "title": "Risiken und Überlegungen",
         "body": "Während Liquiditätspools Ertragsmöglichkeiten bieten, ist es wichtig, sich der damit verbundenen Risiken bewusst zu sein, einschließlich vorübergehender Verluste, Schwachstellen bei intelligenten Verträgen und Marktvolatilität. Benutzer sollten vor der Teilnahme gründliche Recherchen durchführen."
       }
-    }
+    },
+    "haltedDepositTitle": "Einzahlungen sind vorübergehend gestoppt."
   },
   "warningAcknowledgement": {
     "understand": "Ich verstehe",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Erträge",
     "pageSubtitle": "Ertragspotenziale über mehrere Ketten hinweg erkennen und nutzen",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Ertrag",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/en/main.json b/src/assets/translations/en/main.json
index f0766ee6162..53ffe84af05 100644
--- a/src/assets/translations/en/main.json
+++ b/src/assets/translations/en/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Claim Now",
         "claimYour": "Claim your %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Earn yield on your %{asset} through the THORChain Savers Vaults. There is no lock up time, and rewards are accumulated automatically. Yield on THORChain comes from swap fees and block rewards. Single-sided yield is capped at half the double-sided yield of liquidity providers.",
-        "runePoolDescription": "RUNEPool lets you earn more %{asset} by pooling your %{asset} with others. You don't have to pick specific pools, everyone shares in the overall performance.",
-        "runePoolOverviewDescription": "RUNEPool optimizes RUNE usage by depositing it into all POL-enabled liquidity pools in THORChain. By pooling RUNE across these pools, participants earn the combined APY but face exposure to the aggregate impermanent loss. Instead of choosing individual pools, users benefit from the overall performance, effectively investing in a RUNE index and all THORChain POL-enabled assets. This simplifies liquidity provision and reduces individual risk.",
-        "vaultCap": "Vault Cap",
-        "vaultCapTooltip": "Current maximum capacity for this vault",
+      "runePool": {
+        "description": "RUNEPool lets you earn more %{asset} by pooling your %{asset} with others. You don't have to pick specific pools, everyone shares in the overall performance.",
+        "overviewDescription": "RUNEPool optimizes RUNE usage by depositing it into all POL-enabled liquidity pools in THORChain. By pooling RUNE across these pools, participants earn the combined APY but face exposure to the aggregate impermanent loss. Instead of choosing individual pools, users benefit from the overall performance, effectively investing in a RUNE index and all THORChain POL-enabled assets. This simplifies liquidity provision and reduces individual risk.",
+        "introducing": "Introducing RUNEPool",
+        "agree": "I understand that RUNEPool has both a 30 day minimum lockup and a heightened risk of impermanent loss.",
         "haltedDepositTitle": "Deposits are temporarily halted.",
         "disabledDepositTitle": "Deposits are temporarily disabled.",
         "disabledWithdrawTitle": "Withdraws are temporarily disabled.",
         "withdrawLockedTitle": "You have to wait %{timeHuman} to withdraw.",
-        "haltedDescription": "Please tweet at @THORChain to raise the caps!",
-        "protocolFee": "Protocol Fee",
-        "dustAmount": "Dust Amount",
-        "dustAmountTooltip": "A tiny amount of dust is required to identify your address, and will be reserved for later use, when you want to make a withdrawal",
-        "sendDustBody": "You need to send some dust to this address to be able to withdraw.",
-        "sendDust": "Send Dust",
-        "addressToSendTo": "Address to Send To",
-        "introducingSaversVaults": "Introducing Savers Vaults",
-        "introducingRunePool": "Introducing RUNEPool",
-        "risksBody": {
-          "vaults": "Refer to <link>this article</link> for risks involved with savers vaults.",
-          "runePool": "Refer to <link>this article</link> for risks involved with RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Time to break even",
-          "tooltip": "Estimated time to cover deposit fees and earnings."
-        },
         "cannotDepositWhilePendingTx": "Cannot deposit while Txs are pending",
         "cannotWithdrawWhilePendingTx": "Cannot withdraw while Txs are pending",
-        "agreeRunePool": "I understand that RUNEPool has both a 30 day minimum lockup and a heightened risk of impermanent loss."
+        "risksBody": "Refer to <link>this article</link> for risks involved with RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Limit Orders",
     "buyCrypto": "Buy/Sell Crypto",
     "buyCryptoShort": "Buy/Sell",
-    "lending": "Lending",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Pools",
     "rFOX": "rFOX",
@@ -2346,102 +2326,8 @@
     "custom": "Custom"
   },
   "lending": {
-    "lending": "Lending",
-    "repaymentAvailable": "Repayment available",
-    "repaymentUnavailable": "Repayment not yet available",
-    "daysUntilRepayment": "%{numDays} days until repayment",
-    "repaymentDays": "%{numDays} days",
-    "lendingBody": "A listing of all pools that can be borrowed at zero-interest and zero liquidations.",
-    "collateralValue": "Collateral Value",
-    "collateralValueDescription": "Current value of your asset used as collateral",
-    "debtValue": "Debt Value",
-    "loanToValue": "Loan to Value",
-    "availablePools": "Available Pools",
-    "pool": "Pool",
-    "poolDepth": "Pool Depth",
-    "poolDepthDescription": "The healthiness of the pool",
-    "status": "Status",
-    "statusDescription": "The status of the pool",
-    "totalDebtBalance": "Total Debt Balance",
-    "totalDebtBalanceDescription": "Cumulative Debt Balance in the lending pool",
-    "totalCollateral": "Total Collateral",
-    "totalCollateralDescription": "Total Collateral added to the lending pool",
-    "estCollateralizationRatio": "Est. Collateralization Ratio",
-    "estCollateralizationRatioDescription": "A flat Collateralization Ratio of 200% is currently in place. In the future, a dynamic ratio will balance between the maximum and minimum CR based on market conditions.",
-    "collateralizationRatio": "Collateralization Ratio",
-    "totalBorrowers": "Total Borrowers",
-    "totalBorrowersDescription": "Number of borrowers participating",
-    "myLoanInformation": "My Loan Information",
-    "loanInformation": "Loan Summary",
-    "poolInformation": "Pool Information",
-    "collateralBalance": "Collateral Balance",
-    "collateralBalanceDescription": "Total amount of your asset currently held as collateral",
-    "debtBalance": "Debt Balance",
-    "debtBalanceDescription": "Total amount of debt you owe for this loan",
-    "repaymentLock": "Repayment Lock",
-    "repaymentLockDescription": "Minimum period before you can repay your loan",
-    "receiveCollateral": "The amount of collateral you will receive back",
-    "borrow": "Borrow",
-    "repay": "Repay",
-    "repayAmount": "Repay Amount",
-    "unlocked": "Unlocked",
-    "unlockedCollateral": "Unlocked Collateral",
-    "depositAsset": "Deposit %{asset}",
     "switchAssets": "Switch Assets",
-    "outstandingDebt": "Outstanding Debt",
-    "outstandingDebtDescription": "The amount of collateral you've borrowed",
-    "collateral": "Collateral",
-    "debt": "Debt",
-    "healthy": "Depth is optimal, loans are efficient.",
-    "confirmAndBorrow": "Confirm and Borrow",
-    "confirmAndRepay": "Confirm and Repay",
-    "borrowAgain": "Borrow Again",
-    "repayAgain": "Repay Again",
-    "transactionInfo": "Transaction Summary",
-    "repayNoticeTitle": "Hold Up!",
-    "repayNoticeCta": "I understand",
-    "repayNotice": "To get back your collateral you will need to repay 100% of your debt.",
-    "feesNotice": "Fees occurred on the collateral you will receive back after repaying 100% of your debt",
-    "refetchQuote": "Refetch Quote",
-    "haltedAlert": "THORFi services (Lending, Savers and RUNEPool) are currently paused on THORChain. We apologize for any inconvenience.",
-    "faq": {
-      "title": "FAQ",
-      "lending": {
-        "title": "What is THORChain Lending?",
-        "body": "Lending allows users to deposit native collateral, and then create a debt at a collateralization ratio (CR). The debt is always denominated in USD (aka TOR), regardless of what L1 asset the user receives"
-      },
-      "borrowing": {
-        "title": "How does borrowing work?",
-        "body": "Borrowing in THORChain involves using your deposited assets as collateral to take out a loan. The loan is denominated in USD (TOR) and can be received in various L1 assets. With a dynamic collateralization ratio, you can borrow flexibly without the worry of interest or liquidation"
-      },
-      "repayments": {
-        "title": "How does repayment work?",
-        "body": "Repayment in THORChain is flexible, allowing you to repay at any time after your repayment lock has elapsed, and in any asset, which is then converted to TOR. The repayment amount is deducted from your debt balance, and proportional collateral is released back to you upon full repayment"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Repayments are temporarily halted.",
-      "borrowingHalted": "Borrowing is temporarily halted.",
-      "repaymentsDisabled": "Repayments are temporarily disabled.",
-      "borrowingDisabled": "Borrowing is temporarily disabled.",
-      "amountTooLowToReturnCollateral": "Amount too low to return collateral",
-      "amountTooLowToReturnCollateralTooltip": "The repayment is too low for your collateral to be returned. Please try again with a higher amount, or repay a partial amount (which will not return your collateral, but will decrease your debt).",
-      "amountTooSmallUnknownMinimumTooltip": "The repayment amount you have entered is too small. Please try again with a higher amount.",
-      "repaymentUnavailableTooltip": "It is not possible to repay your loan yet. Please wait until the repayment lock has elapsed.",
-      "repaymentsHaltedTooltip": "Repayments are temporarily halted. Please try again later."
-    },
-    "quote": {
-      "collateral": "Total asset amount which will be secured against your loan",
-      "debt": "Total debt you'll owe based on your new loan amount",
-      "repaymentLock": "Minimum period before you can repay your loan",
-      "collateralizationRatio": "Ratio of your collateral value to the loan amount",
-      "feesPlusSlippage": "Total fees occurred, including L1 fees, slippage, and THORChain liquidity fees"
-    },
-    "yourLoans": {
-      "yourLoans": "Your Loans",
-      "emptyTitle": "The Land of Zero Loans!",
-      "emptyBody": "It appears you don't have any loans at the moment. Is this financial zen or just a break before your next big lending adventure? Either way, enjoy the calm!"
-    }
+    "poolInformation": "Pool Information"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Awaiting Confirmation",
@@ -2971,7 +2857,8 @@
         "title": "Risks and Considerations",
         "body": "While liquidity pools offer earning opportunities, it's important to be aware of the risks involved, including impermanent loss, smart contract vulnerabilities, and market volatility. Users should conduct thorough research before participating."
       }
-    }
+    },
+    "haltedDepositTitle": "Deposits are temporarily halted."
   },
   "warningAcknowledgement": {
     "understand": "I understand",
diff --git a/src/assets/translations/es/main.json b/src/assets/translations/es/main.json
index 0a0a9960ea8..95387650fb0 100644
--- a/src/assets/translations/es/main.json
+++ b/src/assets/translations/es/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Reclama ahora",
         "claimYour": "Reclame su %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Obtenga rendimiento de su %{asset} a través de las bóvedas de ahorro de THORChain. No hay tiempo de bloqueo y las recompensas se acumulan automáticamente. El rendimiento en THORChain proviene de las tarifas de intercambio y las recompensas en bloque. El rendimiento unilateral tiene un tope de la mitad del rendimiento bilateral de los proveedores de liquidez.",
-        "runePoolDescription": "RUNEPool permite ganar más %{asset} si agrupas tus %{asset} con otros. No tienes que elegir grupos específicos, todos comparten el rendimiento general.",
-        "runePoolOverviewDescription": "RUNEPool optimiza el uso de RUNE depositándolos en todos los pools de liquidez habilitados para POL en THORChain. Al agrupar RUNE, participantes obtienen APY combinado, pero enfrentan exposición agregada a pérdida impermanente. En lugar de elegir pools individuales, usuarios se benefician del rendimiento general, invirtiendo efectivamente en un índice RUNE y todos los activos habilitados para POL THORChain. Simplifica la provisión de liquidez y reduce  riesgo individual.",
-        "vaultCap": "Límite de bóveda",
-        "vaultCapTooltip": "Capacidad máxima actual para esta bóveda",
+      "runePool": {
+        "description": "RUNEPool permite ganar más %{asset} si agrupas tus %{asset} con otros. No tienes que elegir grupos específicos, todos comparten el rendimiento general.",
+        "overviewDescription": "RUNEPool optimiza el uso de RUNE depositándolos en todos los pools de liquidez habilitados para POL en THORChain. Al agrupar RUNE, participantes obtienen APY combinado, pero enfrentan exposición agregada a pérdida impermanente. En lugar de elegir pools individuales, usuarios se benefician del rendimiento general, invirtiendo efectivamente en un índice RUNE y todos los activos habilitados para POL THORChain. Simplifica la provisión de liquidez y reduce  riesgo individual.",
+        "introducing": "Presentamos RUNEPool",
+        "agree": "Entiendo que RUNEPool tiene un bloqueo mínimo de 30 días y un mayor riesgo de pérdida impermanente.",
         "haltedDepositTitle": "Los depositos estan temporalmente detenidos.",
         "disabledDepositTitle": "Depósitos temporalmente deshabilitados.",
         "disabledWithdrawTitle": "Retiros temporalmente deshabilitados.",
         "withdrawLockedTitle": "Tienes que esperar %{timeHuman} para retirar.",
-        "haltedDescription": "¡Tuitee a @THORChain para aumentar los límites!",
-        "protocolFee": "Tarifa de Protocolo",
-        "dustAmount": "Cantidad de polvo",
-        "dustAmountTooltip": "Se requiere una pequeña cantidad de polvo para identificar su dirección, y se reservará para su uso posterior, cuando desee realizar un retiro",
-        "sendDustBody": "Necesitas enviar algo de polvo a esta dirección para poder retirar.",
-        "sendDust": "Send Dust",
-        "addressToSendTo": "Dirección de envío",
-        "introducingSaversVaults": "Presentamos Bóvedas Savers",
-        "introducingRunePool": "Presentamos RUNEPool",
-        "risksBody": {
-          "vaults": "Refiere a <link>Este artículo</link> por los riesgos de las Bovedas Savers.",
-          "runePool": "Refiere a <link>Este artículo</link> por los riesgos involucrados con RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Tiempo para evitar pérdidas",
-          "tooltip": "Tiempo estimado para cubrir tarifas de depósito y ganancias."
-        },
         "cannotDepositWhilePendingTx": "No se puede depositar mientras Txs están pendientes",
         "cannotWithdrawWhilePendingTx": "No se puede retirar mientras Txs están pendientes",
-        "agreeRunePool": "Entiendo que RUNEPool tiene un bloqueo mínimo de 30 días y un mayor riesgo de pérdida impermanente."
+        "risksBody": "Refiere a <link>Este artículo</link> por los riesgos involucrados con RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Órdenes limitadas",
     "buyCrypto": "Comprar/Vender Cripto",
     "buyCryptoShort": "Comprar/Vender",
-    "lending": "Préstamo",
-    "thorchainLending": "Préstamos THORChain",
     "chainflipLending": "Préstamos Chainflip",
     "pools": "Pools",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Personalizar"
   },
   "lending": {
-    "lending": "Préstamo",
-    "repaymentAvailable": "Pago disponible",
-    "repaymentUnavailable": "Pago aún no disponible",
-    "daysUntilRepayment": "%{numDays} días hasta el pago",
-    "repaymentDays": "%{numDays} días",
-    "lendingBody": "Una lista de todas las piscinas donde puedes pedir préstamos sin intereses ni liquidaciones.",
-    "collateralValue": "Valor colateral",
-    "collateralValueDescription": "Valor actual de su activo utilizado como garantía",
-    "debtValue": "Valor de la deuda",
-    "loanToValue": "Préstamo a valor",
-    "availablePools": "Piscinas disponibles",
-    "pool": "Piscina",
-    "poolDepth": "Profundidad de la piscina",
-    "poolDepthDescription": "La salud de su pool",
-    "status": "Estado",
-    "statusDescription": "El estado del pool",
-    "totalDebtBalance": "Saldo total de la deuda",
-    "totalDebtBalanceDescription": "Saldo de Deuda Acumulada en  conjunto de préstamos",
-    "totalCollateral": "Total de garantía colateral",
-    "totalCollateralDescription": "Garantía total agregada al conjunto de préstamos",
-    "estCollateralizationRatio": "Est. Ratio de colateral",
-    "estCollateralizationRatioDescription": "Actualmente existe índice de garantía fijo del 200%. En el futuro, un ratio dinámico equilibrará el CR máximo y mínimo en función de las condiciones del mercado.",
-    "collateralizationRatio": "Ratio de garantía colateral",
-    "totalBorrowers": "Prestatarios totales",
-    "totalBorrowersDescription": "Número de prestatarios participantes",
-    "myLoanInformation": "Mi información de préstamo",
-    "loanInformation": "Resumen del préstamo",
-    "poolInformation": "Información de la piscina",
-    "collateralBalance": "Saldo de garantía colateral",
-    "collateralBalanceDescription": "Monto total del activo mantenido como garantía",
-    "debtBalance": "Saldo de la deuda",
-    "debtBalanceDescription": "Monto total de la deuda que debe por el préstamo",
-    "repaymentLock": "Bloqueo de repago",
-    "repaymentLockDescription": "Período mínimo antes de poder pagar su préstamo",
-    "receiveCollateral": "La cantidad de garantía que recibirá",
-    "borrow": "Pedir prestado",
-    "repay": "Repago",
-    "repayAmount": "Monto a Pagar",
-    "unlocked": "Desbloqueado",
-    "unlockedCollateral": "Colateral Desbloqueado",
-    "depositAsset": "Depositar %{asset}",
     "switchAssets": "Cambiar Activos",
-    "outstandingDebt": "Deuda pendiente",
-    "outstandingDebtDescription": "La cantidad de garantía que ha tomado prestada",
-    "collateral": "Colateral",
-    "debt": "Deuda",
-    "healthy": "La profundidad es óptima, los préstamos son eficientes.",
-    "confirmAndBorrow": "Confirmar y pedir prestado",
-    "confirmAndRepay": "Confirmar y repagar",
-    "borrowAgain": "Pedir Prestado de nuevo",
-    "repayAgain": "Pagar de nuevo",
-    "transactionInfo": "Resumen de Transacciones",
-    "repayNoticeTitle": "¡Espera!",
-    "repayNoticeCta": "Entiendo",
-    "repayNotice": "Para recuperar su garantía colateral deberá pagar el 100% de su deuda.",
-    "feesNotice": "Se produjeron tarifas sobre la garantía que recibirá después de pagar 100% de su deuda.",
-    "refetchQuote": "Recuperar Cotización",
-    "haltedAlert": "Los servicios THORFi (préstamos, Savers y RUNEPool) están actualmente suspendidos en THORChain. Pedimos disculpas por inconvenientes.",
-    "faq": {
-      "title": "Preguntas más frecuentes",
-      "lending": {
-        "title": "¿Qué son los préstamos THORChain?",
-        "body": "Los préstamos permiten depositar garantías nativas y luego crear una deuda con un índice de garantía (CR). La deuda está denominada en USD (TOR), independiente del activo L1 que reciba."
-      },
-      "borrowing": {
-        "title": "¿Cómo funciona la toma de préstamos?",
-        "body": "Prestar en THORChain implica utilizar sus activos depositados como garantía. El préstamo está denominado en USD (TOR) y puede recibirse en varios activos L1. Con un índice de garantía dinámico, puede prestar de manera flexible sin preocuparse por intereses o liquidación."
-      },
-      "repayments": {
-        "title": "¿Cómo funciona el reembolso o repago?",
-        "body": "El pago en THORChain es flexible, permite pagar en cualquier momento después de que haya transcurrido su bloqueo, y en cualquier activo, que luego se convierte a TOR. El monto de reembolso se deduce del saldo de su deuda y se devuelve la garantía proporcional al realizar el pago total."
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Pagos suspendidos temporalmente.",
-      "borrowingHalted": "Préstamos suspendidos temporalmente.",
-      "repaymentsDisabled": "Pagos temporalmente inhabilitados.",
-      "borrowingDisabled": "Préstamo temporalmente deshabilitado.",
-      "amountTooLowToReturnCollateral": "Monto demasiado bajo para devolver la garantía",
-      "amountTooLowToReturnCollateralTooltip": "El pago es demasiado bajo para que se devuelva la garantía. Inténtelo nuevamente con un monto mayor o pague un monto parcial (lo que no devolverá su garantía, pero disminuirá su deuda).",
-      "amountTooSmallUnknownMinimumTooltip": "El importe de pago que ha introducido es demasiado pequeño. Inténtelo de nuevo con una cantidad mayor.",
-      "repaymentUnavailableTooltip": "Aún no es posible pagar su préstamo. Espere hasta que haya transcurrido el bloqueo de pago.",
-      "repaymentsHaltedTooltip": "Pagos suspendidos temporalmente. Por favor, inténte más tarde."
-    },
-    "quote": {
-      "collateral": "Monto total del activo garantizado contra su préstamo",
-      "debt": "Deuda total que deberás según el monto de tu nuevo préstamo",
-      "repaymentLock": "Período mínimo antes de poder pagar su préstamo",
-      "collateralizationRatio": "Relación entre valor de su garantía y monto del préstamo",
-      "feesPlusSlippage": "Tarifas totales, incluidas tarifas L1, deslizamiento y tarifas de liquidez THORChain"
-    },
-    "yourLoans": {
-      "yourLoans": "Tus préstamos",
-      "emptyTitle": "¡La Tierra de Cero Préstamos!",
-      "emptyBody": "No tienes préstamo en este momento. ¿Es esto un zen financiero o un descanso antes de su próxima aventura crediticia? De cualquier manera, ¡disfruta de la calma!"
-    }
+    "poolInformation": "Información de la piscina"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Pendiente Confirmación",
@@ -2970,7 +2856,8 @@
         "title": "Riesgos y Consideraciones",
         "body": "Si bien los fondos de liquidez ofrecen oportunidades de ganancias, es importante ser consciente de riesgos, como pérdidas no permanentes, vulnerabilidad de contratos inteligentes y volatilidad de mercado. Debe realizar una investigación exhaustiva antes."
       }
-    }
+    },
+    "haltedDepositTitle": "Los depositos estan temporalmente detenidos."
   },
   "warningAcknowledgement": {
     "understand": "Entiendo",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Rendimientos",
     "pageSubtitle": "Descubra y gestione oportunidades de rendimiento en múltiples cadenas",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Rendimiento",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/fr/main.json b/src/assets/translations/fr/main.json
index 970065142e1..f037929f4a4 100644
--- a/src/assets/translations/fr/main.json
+++ b/src/assets/translations/fr/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Réclamer maintenant",
         "claimYour": "Réclamer vos %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Gagnez du rendement sur vos %{asset} grâce aux THORChain Savers Vaults. Il n'y a pas de temps de verrouillage et les récompenses s'accumulent automatiquement. Le rendement sur THORChain provient des frais d'échange et des récompenses de blocs. Le rendement unilatéral est plafonné à la moitié du rendement bilatéral des fournisseurs de liquidité.",
-        "runePoolDescription": "RUNEPool vous permet de gagner des %{asset} en plus en poolant vos %{asset} avec d'autres. Vous n'avez pas à choisir de pools spécifiques, tout le monde partage les performances globales.",
-        "runePoolOverviewDescription": "RUNEPool optimise l'utilisation des RUNE en les déposant dans tous les pools de liquidités compatibles POL de THORChain. En regroupant les RUNE dans ces pools, les participants gagnent l'APY combiné mais sont exposés aux pertes impermanentes globales. Au lieu de choisir des pools individuels, les utilisateurs bénéficient de la performance globale, en investissant en réalité dans un indice RUNE et de tous les actifs compatibles POL de THORChain. Cela simplifie la mise à disposition de liquidités et réduit le risque individuel.",
-        "vaultCap": "Plafond du Vault",
-        "vaultCapTooltip": "Capacité maximale actuelle pour ce Vault",
+      "runePool": {
+        "description": "RUNEPool vous permet de gagner des %{asset} en plus en poolant vos %{asset} avec d'autres. Vous n'avez pas à choisir de pools spécifiques, tout le monde partage les performances globales.",
+        "overviewDescription": "RUNEPool optimise l'utilisation des RUNE en les déposant dans tous les pools de liquidités compatibles POL de THORChain. En regroupant les RUNE dans ces pools, les participants gagnent l'APY combiné mais sont exposés aux pertes impermanentes globales. Au lieu de choisir des pools individuels, les utilisateurs bénéficient de la performance globale, en investissant en réalité dans un indice RUNE et de tous les actifs compatibles POL de THORChain. Cela simplifie la mise à disposition de liquidités et réduit le risque individuel.",
+        "introducing": "Présentation de RUNEPool",
+        "agree": "Je comprends que RUNEPool implique à la fois un verrouillage minimum de 30 jours et un risque accru de pertes impermanentes.",
         "haltedDepositTitle": "Les dépôts sont temporairement suspendus.",
         "disabledDepositTitle": "Les dépôts sont temporairement désactivés.",
         "disabledWithdrawTitle": "Les retraits sont temporairement désactivés.",
         "withdrawLockedTitle": "Vous devez attendre %{timeHuman} pour retirer.",
-        "haltedDescription": "Veuillez tweeter @THORChain pour augmenter les plafonds !",
-        "protocolFee": "Frais de protocole",
-        "dustAmount": "Montant de poussière",
-        "dustAmountTooltip": "Une infime somme de crypto (de la poussière) est nécessaire pour identifier votre adresse et sera réservée pour une utilisation ultérieure, lorsque vous souhaiterez effectuer un retrait",
-        "sendDustBody": "Vous devez envoyer un peu de poussière à cette adresse pour pouvoir effectuer un retrait.",
-        "sendDust": "Envoyer de la poussière",
-        "addressToSendTo": "Adresse à laquelle envoyer",
-        "introducingSaversVaults": "Présentation des Savers Vaults",
-        "introducingRunePool": "Présentation de RUNEPool",
-        "risksBody": {
-          "vaults": "Référez-vous à <link>cet article</link> pour les risques liés aux Savers Vaults.",
-          "runePool": "Référez-vous à <link>cet article</link> pour les risques liés à RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Temps avant le seuil de rentabilité",
-          "tooltip": "Temps estimé pour couvrir les frais de dépôt et les gains."
-        },
         "cannotDepositWhilePendingTx": "Impossible de déposer tant que des Txs sont en attente",
         "cannotWithdrawWhilePendingTx": "Impossible de retirer tant que des Txs sont en attente",
-        "agreeRunePool": "Je comprends que RUNEPool implique à la fois un verrouillage minimum de 30 jours et un risque accru de pertes impermanentes."
+        "risksBody": "Référez-vous à <link>cet article</link> pour les risques liés à RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Ordres à cours limité",
     "buyCrypto": "Acheter/Vendre des cryptos",
     "buyCryptoShort": "Achat/Vente",
-    "lending": "Prêts",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Pools",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Personnalisé"
   },
   "lending": {
-    "lending": "Prêts",
-    "repaymentAvailable": "Remboursement possible",
-    "repaymentUnavailable": "Remboursement pas encore disponible",
-    "daysUntilRepayment": "%{numDays} jours jusqu'au remboursement",
-    "repaymentDays": "%{numDays} jours",
-    "lendingBody": "Une liste de tous les pools pouvant être empruntés à taux zéro et sans liquidation.",
-    "collateralValue": "Valeur du collatéral",
-    "collateralValueDescription": "Valeur actuelle de votre actif utilisé comme garantie",
-    "debtValue": "Valeur de la dette",
-    "loanToValue": "Rapport prêt-valeur",
-    "availablePools": "Pools disponibles",
-    "pool": "Pool",
-    "poolDepth": "Profondeur du pool",
-    "poolDepthDescription": "Le niveau de santé du pool",
-    "status": "Statut",
-    "statusDescription": "L'état du pool",
-    "totalDebtBalance": "Solde total des dettes",
-    "totalDebtBalanceDescription": "Solde cumulatif de la dette dans le pool de prêts",
-    "totalCollateral": "Totale des collatéraux",
-    "totalCollateralDescription": "Collatéral total ajouté au pool de prêts",
-    "estCollateralizationRatio": "Est. du ratio de collatéralisation",
-    "estCollateralizationRatioDescription": "Un ratio de collatéralisation (CR) forfaitaire de 200 % est actuellement en place. À l'avenir, un ratio dynamique s'équilibrera entre le CR maximum et minimum en fonction des conditions du marché.",
-    "collateralizationRatio": "Ratio de collatéralisation",
-    "totalBorrowers": "Total d'emprunteurs",
-    "totalBorrowersDescription": "Nombre d'emprunteurs participants",
-    "myLoanInformation": "Informations sur mon prêt",
-    "loanInformation": "Résumé du prêt",
-    "poolInformation": "Informations sur le pool",
-    "collateralBalance": "Solde du collatéral",
-    "collateralBalanceDescription": "Montant total de votre actif actuellement retenu en collatéral",
-    "debtBalance": "Solde de la dette",
-    "debtBalanceDescription": "Montant total de la dette que vous devez pour ce prêt",
-    "repaymentLock": "Verrou du remboursement",
-    "repaymentLockDescription": "Délai minimum avant de pouvoir rembourser votre prêt",
-    "receiveCollateral": "Le montant du collatéral que vous recevrez en retour",
-    "borrow": "Emprunter",
-    "repay": "Rembourser",
-    "repayAmount": "Rembourser le montant",
-    "unlocked": "Déverrouillé",
-    "unlockedCollateral": "Collatéral débloqué",
-    "depositAsset": "Déposer des %{asset}",
     "switchAssets": "Inverser les actifs",
-    "outstandingDebt": "Dette en cours",
-    "outstandingDebtDescription": "Le montant du collatéral sur lequel vous avez emprunté",
-    "collateral": "Collatéral",
-    "debt": "Dette",
-    "healthy": "La profondeur est optimale, les prêts sont efficaces.",
-    "confirmAndBorrow": "Confirmer et emprunter",
-    "confirmAndRepay": "Confirmer et rembourser",
-    "borrowAgain": "Emprunter à nouveau",
-    "repayAgain": "Rembourser à nouveau",
-    "transactionInfo": "Résumé de transaction",
-    "repayNoticeTitle": "Attendez !",
-    "repayNoticeCta": "Je comprends",
-    "repayNotice": "Pour récupérer votre collatéral, vous devrez rembourser 100 % de votre dette.",
-    "feesNotice": "Les frais liés au collatéral que vous récupérerez après avoir remboursé 100 % de votre dette",
-    "refetchQuote": "Actualiser le devis",
-    "haltedAlert": "Les services THORFi (Prêts, Savers et RUNEPool) sont actuellement suspendus sur THORChain. Nous nous excusons pour la gêne occasionnée.",
-    "faq": {
-      "title": "FAQ",
-      "lending": {
-        "title": "Qu'est-ce que les prêts THORChain ?",
-        "body": "Les prêts permettent aux utilisateurs de déposer un collatéral natif, puis de créer une dette selon un ratio de garantie (CR). La dette est toujours libellée en USD (alias TOR), quel que soit l'actif L1 reçu par l'utilisateur"
-      },
-      "borrowing": {
-        "title": "Comment fonctionne l'emprunt ?",
-        "body": "Emprunter avec THORChain implique d'utiliser vos actifs déposés en collatéral pour contracter un prêt. Le prêt est libellé en USD (TOR) et peut être reçu dans divers actifs L1. Avec un ratio de collatéralisation dynamique, vous pouvez emprunter de manière flexible sans vous soucier des intérêts ou de la liquidation"
-      },
-      "repayments": {
-        "title": "Comment fonctionne le remboursement ?",
-        "body": "Le remboursement sur THORChain est flexible, vous permettant de rembourser à tout moment après expiration de votre verrou de remboursement, et dans n'importe quel actif qui sera ensuite converti en TOR. Le montant du remboursement est déduit du solde de votre dette et une part proportionnelle du collatéral vous est restituée lors du remboursement intégral"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Les remboursements sont temporairement interrompus.",
-      "borrowingHalted": "Les emprunts sont temporairement interrompus.",
-      "repaymentsDisabled": "Les remboursements sont temporairement désactivés.",
-      "borrowingDisabled": "Les emprunts sont temporairement désactivés.",
-      "amountTooLowToReturnCollateral": "Montant trop petit pour restituer le collatéral",
-      "amountTooLowToReturnCollateralTooltip": "Le remboursement est trop petit pour que votre collatéral soit restitué. Veuillez réessayer avec un montant plus élevé ou remboursez un montant partiel (ce qui ne vous rendra pas votre collatéral, mais diminuera votre dette).",
-      "amountTooSmallUnknownMinimumTooltip": "Le montant du remboursement que vous avez saisi est trop petit. Veuillez réessayer avec un montant plus grand.",
-      "repaymentUnavailableTooltip": "Il n'est pas encore possible de rembourser votre prêt. Veuillez attendre que le délai de remboursement soit écoulé.",
-      "repaymentsHaltedTooltip": "Les remboursements sont temporairement interrompus. Veuillez réessayer plus tard."
-    },
-    "quote": {
-      "collateral": "Montant total des actifs qui seront utilisés comme garantie afin de couvrir votre prêt",
-      "debt": "Dette totale que vous devrez en fonction du montant de votre nouveau prêt",
-      "repaymentLock": "Délai minimum avant de pouvoir rembourser votre prêt",
-      "collateralizationRatio": "Rapport entre la valeur de votre collatéral et le montant du prêt",
-      "feesPlusSlippage": "Total des frais perçus, y compris les frais L1, le glissement/slippage et les frais de liquidité de THORChain"
-    },
-    "yourLoans": {
-      "yourLoans": "Vos prêts",
-      "emptyTitle": "Le pays d'Aucun Prêt !",
-      "emptyBody": "Il semble que vous n'ayez aucun prêt pour le moment. Est-ce le zen financier ou juste une pause avant votre prochaine grande aventure d'emprunt ? Quoi qu'il en soit, profitez du calme !"
-    }
+    "poolInformation": "Informations sur le pool"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "En attente de confirmation",
@@ -2970,7 +2856,8 @@
         "title": "Risques et considérations",
         "body": "Bien que les pools de liquidités offrent des opportunités de gains, il est important d'être conscient des risques impliqués, notamment des pertes impermanentes, des vulnérabilités des contrats intelligents et de la volatilité du marché. Les utilisateurs doivent effectuer des recherches approfondies avant de participer."
       }
-    }
+    },
+    "haltedDepositTitle": "Les dépôts sont temporairement suspendus."
   },
   "warningAcknowledgement": {
     "understand": "Je comprends",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Rendements",
     "pageSubtitle": "Découvrez et gérez les opportunités de rendements sur plusieurs chaînes",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Rendement",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/ja/main.json b/src/assets/translations/ja/main.json
index 2279ce95d76..3d958798665 100644
--- a/src/assets/translations/ja/main.json
+++ b/src/assets/translations/ja/main.json
@@ -602,36 +602,18 @@
         "claimNow": "今すぐ獲得する",
         "claimYour": "%{opportunity}を獲得しましょう"
       },
-      "saversVaults": {
-        "description": "THORChain Savers Vaultを通じて %{asset} の収益を獲得しましょう。ロックアップの時間はなく、報酬は自動的に蓄積されます。 THORChainの利回りはスワップ手数料とブロック報酬から得られます。片面利回りは流動性プロバイダーの両面利回りの半分に制限されています。",
-        "runePoolDescription": "RUNEPool では、他のユーザーと %{asset} をプールすることで、より多くの %{asset} を獲得できます。特定のプールを選択する必要はなく、全員が全体のパフォーマンスを共有します。",
-        "runePoolOverviewDescription": "RUNEPool は、THORChain のすべての POL 対応流動性プールに RUNE を預けることで、RUNE の使用を最適化します。これらのプールに RUNE をプールすることで、参加者は合計 APY を獲得しますが、総変動損失のリスクにさらされます。個々のプールを選択する代わりに、ユーザーは全体的なパフォーマンスの恩恵を受け、RUNE インデックスとすべての THORChain POL 対応資産に効果的に投資します。これにより、流動性の提供が簡素化され、個々のリスクが軽減されます。",
-        "vaultCap": "Vaultキャップ",
-        "vaultCapTooltip": "このVaultの現在の最大容量",
+      "runePool": {
+        "description": "RUNEPool では、他のユーザーと %{asset} をプールすることで、より多くの %{asset} を獲得できます。特定のプールを選択する必要はなく、全員が全体のパフォーマンスを共有します。",
+        "overviewDescription": "RUNEPool は、THORChain のすべての POL 対応流動性プールに RUNE を預けることで、RUNE の使用を最適化します。これらのプールに RUNE をプールすることで、参加者は合計 APY を獲得しますが、総変動損失のリスクにさらされます。個々のプールを選択する代わりに、ユーザーは全体的なパフォーマンスの恩恵を受け、RUNE インデックスとすべての THORChain POL 対応資産に効果的に投資します。これにより、流動性の提供が簡素化され、個々のリスクが軽減されます。",
+        "introducing": "RUNEPoolの説明",
+        "agree": "RUNEPool には、最低 30 日間のロックアップと、一時的な損失のリスクの上昇の両方があることを理解しています。",
         "haltedDepositTitle": "一時的に入金を停止しております。",
         "disabledDepositTitle": "デポジットは一時的に無効になります。",
         "disabledWithdrawTitle": "引き出しは一時的に無効になっています。",
         "withdrawLockedTitle": "引き出すには%{timeHuman}待つ必要があります。",
-        "haltedDescription": "上限を増やすには、@THORChain でツイートしてください。",
-        "protocolFee": "プロトコル手数料",
-        "dustAmount": "少額",
-        "dustAmountTooltip": "アドレスを特定するには少額が必要ですが、後で出金したいときに使用するために保存されます。",
-        "sendDustBody": "出金するには、このアドレスに少額を送る必要があります。",
-        "sendDust": "少額を送る",
-        "addressToSendTo": "送信先アドレス",
-        "introducingSaversVaults": "Savers Vaultについて",
-        "introducingRunePool": "RUNEPoolの説明",
-        "risksBody": {
-          "vaults": "参照する <link>この記事</link> Savers Vaultに伴うリスクについて。",
-          "runePool": "参照する <link>この記事</link> RUNEPool に伴うリスクについて。"
-        },
-        "timeToBreakEven": {
-          "title": "損益分岐点の時間",
-          "tooltip": "入金手数料と収益をカバーするまでの推定時間"
-        },
         "cannotDepositWhilePendingTx": "送信保留中は入金できません",
         "cannotWithdrawWhilePendingTx": "送信保留中は出金できません",
-        "agreeRunePool": "RUNEPool には、最低 30 日間のロックアップと、一時的な損失のリスクの上昇の両方があることを理解しています。"
+        "risksBody": "参照する <link>この記事</link> RUNEPool に伴うリスクについて。"
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "指値注文",
     "buyCrypto": "暗号通貨の売買",
     "buyCryptoShort": "売買",
-    "lending": "貸し出し",
-    "thorchainLending": "THORChainレンディング",
     "chainflipLending": "チェーンフリップ・レンディング",
     "pools": "プール",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "カスタム"
   },
   "lending": {
-    "lending": "貸し出し",
-    "repaymentAvailable": "返済可能",
-    "repaymentUnavailable": "返済はまだできません",
-    "daysUntilRepayment": "返済まであと %{numDays} 日",
-    "repaymentDays": "%{numDays} 日",
-    "lendingBody": "ゼロ金利およびゼロ清算で借りられるすべてのプールのリスト。",
-    "collateralValue": "担保価値",
-    "collateralValueDescription": "担保として使用される資産の現在価値",
-    "debtValue": "負債額",
-    "loanToValue": "価値へのローン",
-    "availablePools": "利用可能なプール",
-    "pool": "プール",
-    "poolDepth": "プールの深さ",
-    "poolDepthDescription": "プールの状態",
-    "status": "状態",
-    "statusDescription": "プールの状態",
-    "totalDebtBalance": "総負債残高",
-    "totalDebtBalanceDescription": "貸付プールの累積債務残高",
-    "totalCollateral": "担保総額",
-    "totalCollateralDescription": "貸付プールに追加された総担保",
-    "estCollateralizationRatio": "EST 担保比率",
-    "estCollateralizationRatioDescription": "現在、担保比率は 200% に固定されています。将来的には、市場の状況に基づいて、最大 CRと最小 CRの間で動的に比率が調整される予定です。",
-    "collateralizationRatio": "担保比率",
-    "totalBorrowers": "総借入者数",
-    "totalBorrowersDescription": "参加している借り手の数",
-    "myLoanInformation": "ローン情報",
-    "loanInformation": "ローン概要",
-    "poolInformation": "プール情報",
-    "collateralBalance": "担保価値",
-    "collateralBalanceDescription": "現在担保として保有している資産の総額",
-    "debtBalance": "負債残高",
-    "debtBalanceDescription": "このローンに対して負っている負債の総額",
-    "repaymentLock": "返済ロック",
-    "repaymentLockDescription": "ローンを返済できるまでの最低期間",
-    "receiveCollateral": "返金してもらえる担保金額",
-    "borrow": "借りる",
-    "repay": "返済",
-    "repayAmount": "返済額",
-    "unlocked": "ロック解除済み",
-    "unlockedCollateral": "ロック解除された担保",
-    "depositAsset": "入金 %{asset}",
     "switchAssets": "アセットの切り替え",
-    "outstandingDebt": "負債残高",
-    "outstandingDebtDescription": "借りた担保の額",
-    "collateral": "担保",
-    "debt": "借金",
-    "healthy": "深さは最適で、ローンも効率的です。",
-    "confirmAndBorrow": "確認して借りる",
-    "confirmAndRepay": "確認して返済する",
-    "borrowAgain": "もう一度借りる",
-    "repayAgain": "もう一度返済する",
-    "transactionInfo": "取引概要",
-    "repayNoticeTitle": "待つ",
-    "repayNoticeCta": "理解しました",
-    "repayNotice": "担保を取り戻すには借金を100％返済する必要があります。",
-    "feesNotice": "担保に対して発生した手数料は、借金を100%返済した後に返還されます。",
-    "refetchQuote": "見積もりを再取得する",
-    "haltedAlert": "THORChain では、現在 THORFi サービス (Lending、Savers、RUNEPool) が一時停止中です。ご不便をおかけして申し訳ございません。",
-    "faq": {
-      "title": "よくある質問",
-      "lending": {
-        "title": "THORChainレンディングとは何ですか?",
-        "body": "融資により、ユーザーはネイティブ担保を預け、担保比率 (CR) で借金を作成できます。ユーザーが受け取るL1資産に関係なく、負債は常にUSD(別名 TOR) 建てです。"
-      },
-      "borrowing": {
-        "title": "借入はどのように機能しますか?",
-        "body": "THORChainでの借入には、預けた資産を担保として使用してローンを組むことが含まれます。融資は米ドル (TOR) 建てで、さまざまな L1 資産で受け取ることができます。動的な担保比率により、利息や清算の心配なく柔軟に借入できます。"
-      },
-      "repayments": {
-        "title": "返済はどのように行われますか?",
-        "body": "THORChainでの返済は柔軟であり、返済ロックが経過した後はいつでも、任意の資産で返済することができ、その後TORに変換されます。返済額は債務残高から差し引かれ、全額返済後に比例担保が返金されます。"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "返済は一時停止されます。",
-      "borrowingHalted": "貸出は一時停止となります。",
-      "repaymentsDisabled": "返済は一時的に無効になります。",
-      "borrowingDisabled": "借用は一時的に無効になっています。",
-      "amountTooLowToReturnCollateral": "担保を返還するには金額が低すぎます",
-      "amountTooLowToReturnCollateralTooltip": "返済額が低すぎるため、担保を返却できません。金額を増やして再度お試しいただくか、一部を返済してください (担保は返却されませんが、負債額は減ります)。",
-      "amountTooSmallUnknownMinimumTooltip": "入力した返済額が少なすぎます。金額を増やして再度お試しください。",
-      "repaymentUnavailableTooltip": "まだローンの返済はできません。返済ロックが経過するまでお待ちください。",
-      "repaymentsHaltedTooltip": "返済は一時停止されています。しばらくしてからもう一度お試しください。"
-    },
-    "quote": {
-      "collateral": "ローンに対して担保される資産総額",
-      "debt": "新たなローン金額に基づいて支払うべき負債の合計",
-      "repaymentLock": "ローンを返済できるまでの最低期間",
-      "collateralizationRatio": "融資金額に対する担保価値の比率",
-      "feesPlusSlippage": "L1手数料、スリッページ、THORChain流動性手数料を含む、発生した手数料の合計"
-    },
-    "yourLoans": {
-      "yourLoans": "あなたのローン",
-      "emptyTitle": "ローンゼロ",
-      "emptyBody": "現在、ローンはありません。この時間をお楽しみください！"
-    }
+    "poolInformation": "プール情報"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "確認待ち",
@@ -2970,7 +2856,8 @@
         "title": "リスクと考慮事項",
         "body": "流動性プールは収益機会を提供しますが、一時的な損失、スマートコントラクトの脆弱性、市場の変動性など、関連するリスクを認識することが重要です。ユーザーは参加する前に十分な調査を行う必要があります。"
       }
-    }
+    },
+    "haltedDepositTitle": "一時的に入金を停止しております。"
   },
   "warningAcknowledgement": {
     "understand": "承知しました",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "利回り",
     "pageSubtitle": "複数のチェーンにわたる収益機会の発見と管理",
-    "actions": {
-    },
+    "actions": {},
     "yield": "利回り",
     "apy": "年利",
     "apr": "APR",
diff --git a/src/assets/translations/pt/main.json b/src/assets/translations/pt/main.json
index fc4562763c5..b34ba104fa7 100644
--- a/src/assets/translations/pt/main.json
+++ b/src/assets/translations/pt/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Resgatar agora",
         "claimYour": "Ganhar %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Ganhe recompensas em seu %{asset} através da THORChain Savers Vaults. Não precisa travá-lo e os incentivos são acumulados automaticamente. As recompensas na THORChain vem de taxas de swap e recompensas de blocos. O ganho do single-sided é limitado à metade do ganho obtido pelos provedores de liquidez em pools double-sided.",
-        "runePoolDescription": "RUNEPool permite que você ganhe mais %{asset} ao juntar seu %{asset} com outros. Você não precisa escolher pools específicos, todos compartilham o desempenho geral.",
-        "runePoolOverviewDescription": "O RUNEPool otimiza o uso do RUNE depositando-o em todos os pools de liquidez habilitados para POL no THORChain. Ao reunir o RUNE entre esses pools, os participantes ganham o APY combinado, mas enfrentam a exposição à perda impermanente agregada. Em vez de escolher pools individuais, os usuários se beneficiam do desempenho geral, investindo efetivamente em um índice RUNE e em todos os ativos habilitados para POL do THORChain. Isso simplifica o fornecimento de liquidez e reduz o risco individual.",
-        "vaultCap": "Limite da Vault",
-        "vaultCapTooltip": "Capacidade máxima atual para este cofre",
+      "runePool": {
+        "description": "RUNEPool permite que você ganhe mais %{asset} ao juntar seu %{asset} com outros. Você não precisa escolher pools específicos, todos compartilham o desempenho geral.",
+        "overviewDescription": "O RUNEPool otimiza o uso do RUNE depositando-o em todos os pools de liquidez habilitados para POL no THORChain. Ao reunir o RUNE entre esses pools, os participantes ganham o APY combinado, mas enfrentam a exposição à perda impermanente agregada. Em vez de escolher pools individuais, os usuários se beneficiam do desempenho geral, investindo efetivamente em um índice RUNE e em todos os ativos habilitados para POL do THORChain. Isso simplifica o fornecimento de liquidez e reduz o risco individual.",
+        "introducing": "Apresentando RUNEPool",
+        "agree": "Entendo que o RUNEPool tem um bloqueio mínimo de 30 dias e um risco maior de perda impermanente.",
         "haltedDepositTitle": "Depósitos estão temporariamente desabilitados. ",
         "disabledDepositTitle": "Os depósitos estão temporariamente desativados.",
         "disabledWithdrawTitle": "Os saques estão temporariamente desativados.",
         "withdrawLockedTitle": "Você tem que esperar %{timeHuman} para sacar.",
-        "haltedDescription": "Por favor, twitte em @THORChain para aumentar o limite!",
-        "protocolFee": "Taxas do Protocolo",
-        "dustAmount": "Saldo Restante",
-        "dustAmountTooltip": "Uma pequena quantidade de saldo é necessário para identificar seus endereços, e será separada para um uso posterior, quando você realizar seu saque",
-        "sendDustBody": "Você precisar enviar um pouco de suas criptos para este endereço, permitindo a você sacar seu dinheiro. ",
-        "sendDust": "Enviar Cripto",
-        "addressToSendTo": "Endereço para Enviar",
-        "introducingSaversVaults": "Introduzindo a Savers Vault",
-        "introducingRunePool": "Apresentando RUNEPool",
-        "risksBody": {
-          "vaults": "Indique para <link>este artigo</link> para riscos envolvidos com a Savers Vault",
-          "runePool": "Indique para <link>este artigo</link> para riscos envolvidos com o RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Tempo para igualar",
-          "tooltip": "Tempo estimado para cobrir taxas de depósito e ganhos."
-        },
         "cannotDepositWhilePendingTx": "Não é possível depositar enquanto as Txs estiverem pendentes",
         "cannotWithdrawWhilePendingTx": "Não é possível sacar enquanto as Txs estiverem pendentes",
-        "agreeRunePool": "Entendo que o RUNEPool tem um bloqueio mínimo de 30 dias e um risco maior de perda impermanente."
+        "risksBody": "Indique para <link>este artigo</link> para riscos envolvidos com o RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Ordens Limite",
     "buyCrypto": "Compre Cripto",
     "buyCryptoShort": "Compre/venda",
-    "lending": "Empréstimo",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Pools",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Customizar"
   },
   "lending": {
-    "lending": "Empréstimo",
-    "repaymentAvailable": "Pagamento disponível",
-    "repaymentUnavailable": "Reembolso ainda não disponível",
-    "daysUntilRepayment": "%{numDays} dias até o pagamento",
-    "repaymentDays": "%{numDays} dias",
-    "lendingBody": "Uma lista de todas os pools que podem ser emprestados sem custo e zero liquidações.",
-    "collateralValue": "Valor colateral",
-    "collateralValueDescription": "Valor atual do ativo usado como garantia",
-    "debtValue": "Valor da dívida",
-    "loanToValue": "Loan to Value",
-    "availablePools": "Pools disponíveis",
-    "pool": "Pool",
-    "poolDepth": "Liquidez da pool",
-    "poolDepthDescription": "A saúda da pool",
-    "status": "Status",
-    "statusDescription": "O estado da pool",
-    "totalDebtBalance": "Débito Total",
-    "totalDebtBalanceDescription": "Saldo acumulado da dívida no pool de empréstimos",
-    "totalCollateral": "Colateral Total",
-    "totalCollateralDescription": "Garantia total adicionada ao pool de empréstimos",
-    "estCollateralizationRatio": "Relação Estim. da Colateralização",
-    "estCollateralizationRatioDescription": "Uma Taxa de Colateralização fixa de 200% está atualmente em vigor. No futuro, uma taxa dinâmica equilibrará entre o CR máximo e mínimo com base nas condições de mercado.",
-    "collateralizationRatio": "Relação da Colateralização",
-    "totalBorrowers": "Emprestadores Totais",
-    "totalBorrowersDescription": "Número de pessoas que emprestam capital participando",
-    "myLoanInformation": "Informação do Meu Empréstimo",
-    "loanInformation": "Resumo dos Empréstimos",
-    "poolInformation": "Informação das Pools",
-    "collateralBalance": "Saldo dos Colaterais",
-    "collateralBalanceDescription": "Valor total dos seus ativos atualmente mantido como garantia",
-    "debtBalance": "Saldo da dívida",
-    "debtBalanceDescription": "Valor total do débito que você tem pendente no seu empréstimo",
-    "repaymentLock": "Trava do Repagamento",
-    "repaymentLockDescription": "Período mínimo antes de você pagar seu empréstimo",
-    "receiveCollateral": "O valor da garantia que você receberá de volta",
-    "borrow": "Emprestar",
-    "repay": "Pagar de volta",
-    "repayAmount": "Pagar Quantia",
-    "unlocked": "Destravado",
-    "unlockedCollateral": "Colateral Desbloqueada",
-    "depositAsset": "Deposite %{asset}",
     "switchAssets": "Trocar ativos",
-    "outstandingDebt": "Débito Pendente",
-    "outstandingDebtDescription": "O valor da garantia que você tomou emprestado",
-    "collateral": "Garantia",
-    "debt": "Dívida",
-    "healthy": "A profundidade é ótima, os empréstimos são eficientes.",
-    "confirmAndBorrow": "Confirmar e emprestar",
-    "confirmAndRepay": "Confirmar e Pagar",
-    "borrowAgain": "Emprestar Novamente",
-    "repayAgain": "Pagar Novamente",
-    "transactionInfo": "Resumo transação",
-    "repayNoticeTitle": "Calma ai!",
-    "repayNoticeCta": "Eu entendo",
-    "repayNotice": "Para recuperar sua garantia, você precisará pagar 100% de sua dívida.",
-    "feesNotice": "Taxas cobradas sobre a garantia que você recebeu de volta após pagar 100% de sua dívida",
-    "refetchQuote": "Atualizar",
-    "haltedAlert": "Os serviços THORFi (Lending, Savers e RUNEPool) estão atualmente pausados no THORChain. Pedimos desculpas por qualquer inconveniente.",
-    "faq": {
-      "title": "FAQ",
-      "lending": {
-        "title": "O que é empréstimo THORChain?",
-        "body": "Fornecer liquidez permitem que os usuários depositem garantias nativas e, em seguida, criem um débito com proporção de colateralização (CR). A dívida é sempre denominada em USD (também conhecido como TOR), independentemente do ativo L1 que o usuário recebe."
-      },
-      "borrowing": {
-        "title": "Como funciona o empréstimo?",
-        "body": "Emprestar no THORChain envolve o uso de seus ativos depositados como garantia para contrair um empréstimo. O empréstimo é denominado em USD (TOR) e pode ser recebido em diversos ativos L1. Com um índice de colateralização dinâmico, você pode emprestar com flexibilidade, sem se preocupar com juros ou liquidação"
-      },
-      "repayments": {
-        "title": "Como funciona o pagamento?",
-        "body": "O pagamento na THORChain é flexível, permitindo que você pague a qualquer momento após o término do bloqueio de pagamento e em qualquer ativo, que é então convertido em TOR. O valor do pagamento é deduzido do saldo da sua dívida e a garantia proporcional é devolvida a você após o reembolso total"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Os reembolsos estão temporariamente suspensos.",
-      "borrowingHalted": "Os empréstimos estão temporariamente suspensos.",
-      "repaymentsDisabled": "Os reembolsos estão temporariamente desativados.",
-      "borrowingDisabled": "O empréstimo está temporariamente desativado.",
-      "amountTooLowToReturnCollateral": "Valor muito baixo para devolver o colateral",
-      "amountTooLowToReturnCollateralTooltip": "O pagamento é baixo demais para sua garantia ser devolvida. Tente novamente com um valor maior ou pague um valor parcial (o que não devolverá sua garantia, mas diminuirá sua dívida).",
-      "amountTooSmallUnknownMinimumTooltip": "O valor do pagamento inserido é muito pequeno. Por favor, tente novamente com um valor maior.",
-      "repaymentUnavailableTooltip": "Ainda não é possível pagar o seu empréstimo. Aguarde até que o bloqueio de pagamento termine.",
-      "repaymentsHaltedTooltip": "Os pagamentos estão temporariamente suspensos. Por favor, tente novamente mais tarde."
-    },
-    "quote": {
-      "collateral": "Valor total do ativo que será garantido pelo seu empréstimo",
-      "debt": "Débito total que você deve com base no valor do novo empréstimo",
-      "repaymentLock": "Período mínimo antes de você poder pagar seu empréstimo",
-      "collateralizationRatio": "Proporção entre o valor da sua garantia e o valor do empréstimo",
-      "feesPlusSlippage": "O total de taxas cobradas, incluindo taxas L1, slippage e taxas de liquidez THORChain"
-    },
-    "yourLoans": {
-      "yourLoans": "Seus Empréstimos",
-      "emptyTitle": "A Terra dos Empréstimos Zero!",
-      "emptyBody": "Parece que você não tem nenhum empréstimo no momento. Isso é momento zen das suas finanças ou apenas uma pausa antes de sua próxima grande aventura de empréstimo? De qualquer forma, aproveite a calma!"
-    }
+    "poolInformation": "Informação das Pools"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Aguardando confirmação",
@@ -2970,7 +2856,8 @@
         "title": "Riscos e Considerações",
         "body": "Embora as pools de liquidez ofereçam oportunidades de ganhos, é importante estar ciente dos riscos envolvidos, incluindo perdas impermanentes, vulnerabilidades de contratos inteligentes e volatilidade do mercado. Os usuários devem realizar uma pesquisa completa antes de participar."
       }
-    }
+    },
+    "haltedDepositTitle": "Depósitos estão temporariamente desabilitados. "
   },
   "warningAcknowledgement": {
     "understand": "Eu entendo",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Yields",
     "pageSubtitle": "Descubra e gerencie oportunidades de rendimento em várias redes.",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Yield",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/ru/main.json b/src/assets/translations/ru/main.json
index 0ead9c68aba..76104819ffc 100644
--- a/src/assets/translations/ru/main.json
+++ b/src/assets/translations/ru/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Заклеймить сейчас",
         "claimYour": "Заклеймить свои %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Получайте доход от вашего %{asset} через хранилища THORChain. Время блокировки отсутствует, а вознаграждения накапливаются автоматически. Доходность THORChain складывается из комиссий за своп и вознаграждений за блокчейн. Односторонняя доходность ограничена половиной двусторонней доходности поставщиков ликвидности.",
-        "runePoolDescription": "RUNEPool позволяет вам зарабатывать больше %{asset}, объединяя свои %{asset} с другими. Вам не нужно выбирать конкретные пулы, все участвуют в общей производительности.",
-        "runePoolOverviewDescription": "RUNEPool оптимизирует использование RUNE, размещая его во всех пулах ликвидности THORChain, поддерживающих пулы. Объединяя RUNE в этих пулах, участники зарабатывают совокупную APY, но подвергаются риску совокупных непостоянных потерь. Вместо того чтобы выбирать отдельные пулы, пользователи получают выгоду от общей производительности, эффективно инвестируя в индекс RUNE и все активы THORChain с поддержкой пулов. Это упрощает предоставление ликвидности и снижает индивидуальный риск.",
-        "vaultCap": "Капитализация хранилища",
-        "vaultCapTooltip": "Текущая максимальная вместимость данного хранилища",
+      "runePool": {
+        "description": "RUNEPool позволяет вам зарабатывать больше %{asset}, объединяя свои %{asset} с другими. Вам не нужно выбирать конкретные пулы, все участвуют в общей производительности.",
+        "overviewDescription": "RUNEPool оптимизирует использование RUNE, размещая его во всех пулах ликвидности THORChain, поддерживающих пулы. Объединяя RUNE в этих пулах, участники зарабатывают совокупную APY, но подвергаются риску совокупных непостоянных потерь. Вместо того чтобы выбирать отдельные пулы, пользователи получают выгоду от общей производительности, эффективно инвестируя в индекс RUNE и все активы THORChain с поддержкой пулов. Это упрощает предоставление ликвидности и снижает индивидуальный риск.",
+        "introducing": "Представляем вам RUNEPool",
+        "agree": "Я понимаю, что RUNEPool имеет как минимальную блокировку на 30 дней, так и повышенный риск непостоянной потери.",
         "haltedDepositTitle": "Вклады временно приостановлены.",
         "disabledDepositTitle": "Депозиты временно отключены.",
         "disabledWithdrawTitle": "Вывод средств временно отключен.",
         "withdrawLockedTitle": "Чтобы снять деньги, вам придется подождать %{timeHuman}.",
-        "haltedDescription": "Пожалуйста, напишите в твиттере @THORChain, чтобы поднять капитализацию!",
-        "protocolFee": "Плата за протокол",
-        "dustAmount": "Сумма Dust",
-        "dustAmountTooltip": "Крошечное количество dust требуется для идентификации вашего адреса и будет зарезервировано для последующего использования, когда вы захотите снять деньги.",
-        "sendDustBody": "Чтобы снять деньги, вам нужно отправить на этот адрес немного dust.",
-        "sendDust": "Отправить Dust",
-        "addressToSendTo": "Адрес, на который необходимо отправить",
-        "introducingSaversVaults": "Представляем вашему вниманию хранилища Savers",
-        "introducingRunePool": "Представляем вам RUNEPool",
-        "risksBody": {
-          "vaults": "См. <link>эту статью</link> за риски, связанные с хранилищами сбережений.",
-          "runePool": "См. <link>эту статью</link> о рисках, связанных с использованием RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Время выйти на безубыточность",
-          "tooltip": "Расчетное время для покрытия комиссионных по вкладу и заработка."
-        },
         "cannotDepositWhilePendingTx": "Невозможно пополнить счет, пока транзакция  находится на рассмотрении",
         "cannotWithdrawWhilePendingTx": "Невозможно снять средства, пока транзакция находится на рассмотрении",
-        "agreeRunePool": "Я понимаю, что RUNEPool имеет как минимальную блокировку на 30 дней, так и повышенный риск непостоянной потери."
+        "risksBody": "См. <link>эту статью</link> о рисках, связанных с использованием RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Лимитные ордера",
     "buyCrypto": "Купить криптовалюту",
     "buyCryptoShort": "Купить/Продать",
-    "lending": "Кредитование",
-    "thorchainLending": "Кредитование  THORChain",
     "chainflipLending": "Chainflip Lending",
     "pools": "Пулы",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Пользовательский"
   },
   "lending": {
-    "lending": "Кредитование",
-    "repaymentAvailable": "Возможность погашения",
-    "repaymentUnavailable": "Погашение пока не доступно",
-    "daysUntilRepayment": "%{numDays} дней до погашения",
-    "repaymentDays": "%{numDays} дней",
-    "lendingBody": "Перечень всех пулов, которые могут быть заимствованы под нулевые проценты и с нулевой ликвидацией.",
-    "collateralValue": "Размер обеспечения",
-    "collateralValueDescription": "Текущая стоимость вашего актива, используемого в качестве залога",
-    "debtValue": "Размер долга",
-    "loanToValue": "Отношение кредита к стоимости",
-    "availablePools": "Доступные пулы",
-    "pool": "Пул",
-    "poolDepth": "Размер пула",
-    "poolDepthDescription": "Состояние пула",
-    "status": "Статус",
-    "statusDescription": "Состояние пула",
-    "totalDebtBalance": "Общий остаток задолженности",
-    "totalDebtBalanceDescription": "Остаток накопленной задолженности в кредитном пуле",
-    "totalCollateral": "Общее обеспечение",
-    "totalCollateralDescription": "Итого Обеспечение, добавленное в кредитный пул",
-    "estCollateralizationRatio": "Расчет. Коэффициент обеспеченности",
-    "estCollateralizationRatioDescription": "В настоящее время действует единый коэффициент обеспеченности в размере 200%. В будущем динамический коэффициент будет балансировать между максимальным и минимальным КО в зависимости от рыночных условий.",
-    "collateralizationRatio": "Коэффициент обеспеченности",
-    "totalBorrowers": "Всего заемщиков",
-    "totalBorrowersDescription": "Количество участвующих заемщиков",
-    "myLoanInformation": "Моя информация о кредите",
-    "loanInformation": "Краткая информация о кредите",
-    "poolInformation": "Информация о пуле",
-    "collateralBalance": "Баланс обеспечения",
-    "collateralBalanceDescription": "Общая сумма ваших активов, которые в настоящее время находятся в залоге",
-    "debtBalance": "Баланс задолженности",
-    "debtBalanceDescription": "Общая сумма долга по этому кредиту",
-    "repaymentLock": "Блокировка погашения",
-    "repaymentLockDescription": "Минимальный срок, в течение которого вы сможете погасить кредит",
-    "receiveCollateral": "Сумма залога, которую вы получите обратно",
-    "borrow": "Занять",
-    "repay": "Погасить",
-    "repayAmount": "Сумма погашения",
-    "unlocked": "Разблокировано",
-    "unlockedCollateral": "Разблокированный залог",
-    "depositAsset": "Deposit %{asset}",
     "switchAssets": "Переключить активы",
-    "outstandingDebt": "Непогашенная задолженность",
-    "outstandingDebtDescription": "Сумма залога, которую вы взяли в кредит",
-    "collateral": "Обеспечение",
-    "debt": "Долг",
-    "healthy": "Глубина оптимальна, кредиты эффективны.",
-    "confirmAndBorrow": "Подтверждать и заимствовать",
-    "confirmAndRepay": "Подтвердить и погасить",
-    "borrowAgain": "Одолжить снова",
-    "repayAgain": "Вернуть долг",
-    "transactionInfo": "Сводка по сделке",
-    "repayNoticeTitle": "Подождите!",
-    "repayNoticeCta": "Я понимаю",
-    "repayNotice": "Для возврата залога необходимо погасить 100% долга.",
-    "feesNotice": "Комиссионные, начисленные на залог, который вы получите обратно после погашения 100% долга",
-    "refetchQuote": "Refetch Quote",
-    "haltedAlert": "Услуги THORFi (Lending, Savers и RUNEPool) в настоящее время приостановлены на THORChain. Мы приносим извинения за возможные неудобства.",
-    "faq": {
-      "title": "ЧАСТЫЕ ВОПРОСЫ",
-      "lending": {
-        "title": "Что такое THORChain кредитование?",
-        "body": "Кредитование позволяет пользователям вносить собственный залог, а затем создавать долг с коэффициентом обеспечения (КО). Долг всегда деноминирован в USD (aka TOR), независимо от того, какой актив L1 получает пользователь."
-      },
-      "borrowing": {
-        "title": "Как происходит заимствование?",
-        "body": "Заимствование в THORChain подразумевает использование размещенных вами активов в качестве залога для получения кредита. Кредит деноминирован в долларах США (TOR) и может быть получен в различных активах L1. Благодаря динамическому коэффициенту залога вы можете брать займы на гибких условиях, не беспокоясь о процентах или ликвидации."
-      },
-      "repayments": {
-        "title": "Как происходит погашение кредита?",
-        "body": "Погашение долга в THORChain является гибким, позволяя вам погасить долг в любое время после истечения срока блокировки погашения и любым активом, который затем конвертируется в TOR. Сумма погашения вычитается из баланса вашего долга, а пропорциональный залог возвращается к вам после полного погашения."
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Выплаты по кредиту временно прекращаются",
-      "borrowingHalted": "Заимствования временно прекращены.",
-      "repaymentsDisabled": "Погашение временно отключено.",
-      "borrowingDisabled": "Займы временно отключены.",
-      "amountTooLowToReturnCollateral": "Сумма слишком мала для возврата залога",
-      "amountTooLowToReturnCollateralTooltip": "Сумма погашения слишком мала для возврата залога. Пожалуйста, повторите попытку с большей суммой или погасите часть суммы (это не вернет вам залог, но уменьшит ваш долг).",
-      "amountTooSmallUnknownMinimumTooltip": "Введенная вами сумма погашения слишком мала. Пожалуйста, повторите попытку с большей суммой.",
-      "repaymentUnavailableTooltip": "Погашение кредита пока невозможно. Пожалуйста, подождите, пока не истечет срок блокировки погашения.",
-      "repaymentsHaltedTooltip": "Выплаты временно прекращены. Пожалуйста, повторите попытку позже."
-    },
-    "quote": {
-      "collateral": "Общая сумма активов, которые будут обеспечены вашим кредитом",
-      "debt": "Общая сумма долга, которую вы должны будете выплатить, исходя из новой суммы кредита",
-      "repaymentLock": "Минимальный срок, в течение которого вы сможете погасить кредит",
-      "collateralizationRatio": "Отношение стоимости вашего залога к сумме кредита",
-      "feesPlusSlippage": "Общая сумма возникших комиссий, включая комиссию за L1, проскальзывание и комиссию за ликвидность THORChain"
-    },
-    "yourLoans": {
-      "yourLoans": "Ваши кредиты",
-      "emptyTitle": "Страна нулевых займов!",
-      "emptyBody": "Похоже, что сейчас у вас нет ни одного кредита. Это финансовый дзен или просто передышка перед следующим большим кредитным приключением? В любом случае, наслаждайтесь спокойствием!"
-    }
+    "poolInformation": "Информация о пуле"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Ожидается подтверждение",
@@ -2970,7 +2856,8 @@
         "title": "Риски и соображения",
         "body": "Несмотря на то что пулы ликвидности предлагают возможности для заработка, важно осознавать связанные с ними риски, включая непостоянный убыток, уязвимость смарт-контрактов и волатильность рынка. Пользователям следует провести тщательное исследование, прежде чем принимать в нем участие."
       }
-    }
+    },
+    "haltedDepositTitle": "Вклады временно приостановлены."
   },
   "warningAcknowledgement": {
     "understand": "Я понимаю",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Прибыль",
     "pageSubtitle": "Обнаруживайте и управляйте возможностями получения дохода в нескольких сетях",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Доходность",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/tr/main.json b/src/assets/translations/tr/main.json
index 2da15f2d398..901faa7813d 100644
--- a/src/assets/translations/tr/main.json
+++ b/src/assets/translations/tr/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Şimdi Talep Et",
         "claimYour": " %{opportunity} Talep Edin"
       },
-      "saversVaults": {
-        "description": "THORChain Saver Vaults aracılığıyla %{asset} üzerinden getiri kazanın. Kilitlenme süresi yoktur ve ödüller otomatik olarak biriktirilir. THORChain'de getiri, takas ücretleri ve blok ödüllerinden gelir. Tek taraflı getiri, likidite sağlayıcılarının çift taraflı getirisinin yarısı ile sınırlandırılmıştır.",
-        "runePoolDescription": "RUNEPool, %{asset}'inizi başkalarıyla birleştirerek daha fazla %{asset} kazanmanızı sağlar. Belirli havuzları seçmenize gerek yok, herkes genel performanstan pay alır.",
-        "runePoolOverviewDescription": "RUNEPool, RUNE kullanımını THORChain'deki tüm POL-enabled likidite havuzlarına yatırarak optimize eder. RUNE'yi bu havuzlar arasında bir araya getirerek, katılımcılar birleşik APY'yi kazanır ancak toplam geçici kayba maruz kalır. Kullanıcılar, bireysel havuzları seçmek yerine genel performanstan yararlanır ve etkili bir şekilde bir RUNE endeksine ve tüm THORChain POL-enabled varlıklara yatırım yapar. Bu, likidite sağlamayı basitleştirir ve bireysel riski azaltır.",
-        "vaultCap": "Kasa Üst Limiti",
-        "vaultCapTooltip": "Bu kasa için mevcut maksimum kapasite",
+      "runePool": {
+        "description": "RUNEPool, %{asset}'inizi başkalarıyla birleştirerek daha fazla %{asset} kazanmanızı sağlar. Belirli havuzları seçmenize gerek yok, herkes genel performanstan pay alır.",
+        "overviewDescription": "RUNEPool, RUNE kullanımını THORChain'deki tüm POL-enabled likidite havuzlarına yatırarak optimize eder. RUNE'yi bu havuzlar arasında bir araya getirerek, katılımcılar birleşik APY'yi kazanır ancak toplam geçici kayba maruz kalır. Kullanıcılar, bireysel havuzları seçmek yerine genel performanstan yararlanır ve etkili bir şekilde bir RUNE endeksine ve tüm THORChain POL-enabled varlıklara yatırım yapar. Bu, likidite sağlamayı basitleştirir ve bireysel riski azaltır.",
+        "introducing": "RUNEPool'u Tanıtımı",
+        "agree": "RUNEPool'un hem 30 günlük asgari bir kilitleme süresine sahip olduğunu hem de kalıcı olmayan kayıp riskinin yüksek olduğunu anlıyorum.",
         "haltedDepositTitle": "Para yatırma işlemleri geçici olarak durdurulmuştur.",
         "disabledDepositTitle": "Para yatırma işlemleri geçici olarak devre dışı bırakıldı.",
         "disabledWithdrawTitle": "Para çekme işlemleri geçici olarak devre dışı bırakıldı.",
         "withdrawLockedTitle": "Para çekmek için %{timeHuman} beklemeniz gerekiyor.",
-        "haltedDescription": "Lütfen @THORChain adresine tweet atarak üst sınırınızı yükseltin!",
-        "protocolFee": "Protokol Ücreti",
-        "dustAmount": "Toz Bakiye",
-        "dustAmountTooltip": "Adresinizi tanımlamak için küçük bir miktar toz gereklidir ve daha sonra para çekmek istediğinizde kullanılmak üzere saklanacaktır",
-        "sendDustBody": "Para çekebilmek için bu adrese biraz toz göndermeniz gerekiyor.",
-        "sendDust": "Toz Gönder",
-        "addressToSendTo": "Gönderilecek Adres",
-        "introducingSaversVaults": "Saver Vaults Giriş",
-        "introducingRunePool": "RUNEPool'u Tanıtımı",
-        "risksBody": {
-          "vaults": "Saver Vaults ile ilgili riskler için <link>bu makaleye</link> bakın.",
-          "runePool": "Saver Vaults ile ilgili riskler için <link>bu makaleye</link> RUNEPool ile ilgili riskler için."
-        },
-        "timeToBreakEven": {
-          "title": "Eşitiliği bozma",
-          "tooltip": "Para yatırma ücretlerini ve kazançları karşılamak için tahmini süre."
-        },
         "cannotDepositWhilePendingTx": "Tx'ler beklemedeyken para yatırılamaz",
         "cannotWithdrawWhilePendingTx": "Tx'ler beklemedeyken çekim yapılamaz",
-        "agreeRunePool": "RUNEPool'un hem 30 günlük asgari bir kilitleme süresine sahip olduğunu hem de kalıcı olmayan kayıp riskinin yüksek olduğunu anlıyorum."
+        "risksBody": "Saver Vaults ile ilgili riskler için <link>bu makaleye</link> RUNEPool ile ilgili riskler için."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Limit Emirleri",
     "buyCrypto": "Kripto Al/Sat",
     "buyCryptoShort": "Al/Sat",
-    "lending": "Borç Verme",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Havuzlar",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Özel"
   },
   "lending": {
-    "lending": "Borç Verme",
-    "repaymentAvailable": "Geri ödeme mevcut",
-    "repaymentUnavailable": "Geri ödeme henüz mümkün değil",
-    "daysUntilRepayment": "Geri ödemeye %{numDays} gün kaldı",
-    "repaymentDays": "%{numDays} gün",
-    "lendingBody": "Sıfır faiz ve sıfır tasfiyeyle ödünç alınabilecek tüm havuzların listesi.",
-    "collateralValue": "Teminat Değeri",
-    "collateralValueDescription": "Teminat olarak kullanılan varlığınızın güncel değeri",
-    "debtValue": "Borç Değeri",
-    "loanToValue": "Kredi Değeri",
-    "availablePools": "Mevcut Havuzlar",
-    "pool": "Havuz",
-    "poolDepth": "Havuz Derinliği",
-    "poolDepthDescription": "Havuzun sağlığı",
-    "status": "Durum",
-    "statusDescription": "Havuzun durumu",
-    "totalDebtBalance": "Toplam Borç Bakiyesi",
-    "totalDebtBalanceDescription": "Kredi havuzundaki kümülatif borç bakiyesi",
-    "totalCollateral": "Toplam Teminat",
-    "totalCollateralDescription": "Kredi havuzuna eklenen Toplam Teminat",
-    "estCollateralizationRatio": "Tahmini Teminat Oranı",
-    "estCollateralizationRatioDescription": "Şu anda %200'lük sabit bir Teminat Oranı mevcuttur. Gelecekte, piyasa koşullarına bağlı olarak maksimum ve minimum CR arasında dinamik bir oran dengelenecektir.",
-    "collateralizationRatio": "Teminat Oranı",
-    "totalBorrowers": "Tüm Borçlular",
-    "totalBorrowersDescription": "Katılan borçlu sayısı",
-    "myLoanInformation": "Kredi Bilgilerim",
-    "loanInformation": "Kredi Özeti",
-    "poolInformation": "Havuz Bilgileri",
-    "collateralBalance": "Teminat Bakiyesi",
-    "collateralBalanceDescription": "Halihazırda teminat olarak tutulan varlığınızın toplam tutarı",
-    "debtBalance": "Borç Bakiyesi",
-    "debtBalanceDescription": "Bu kredi için borçlu olduğunuz toplam borç tutarı",
-    "repaymentLock": "Geri Ödeme Kilidi",
-    "repaymentLockDescription": "Kredinizi geri ödeyebilmeniz için gereken minimum süre",
-    "receiveCollateral": "Geri alacağınız teminat miktarı",
-    "borrow": "Borç Al",
-    "repay": "Geri Öde",
-    "repayAmount": "Geri Ödeme Tutarı",
-    "unlocked": "Kilitli değil",
-    "unlockedCollateral": "Kilidi Açılmış Teminat",
-    "depositAsset": "Depozit %{asset}",
     "switchAssets": "Varlıkları Değiştir",
-    "outstandingDebt": "Ödenmemiş Borç",
-    "outstandingDebtDescription": "Ödünç aldığınız teminat miktarı",
-    "collateral": "Teminat",
-    "debt": "Borç",
-    "healthy": "Derinlik optimaldir, krediler etkilidir.",
-    "confirmAndBorrow": "Onayla ve Borç Al",
-    "confirmAndRepay": "Onayla ve Geri Öde",
-    "borrowAgain": "Tekrar Ödünç Al",
-    "repayAgain": "Tekrar Öde",
-    "transactionInfo": "İşlem Özeti",
-    "repayNoticeTitle": "Gecikti!",
-    "repayNoticeCta": "Anladım",
-    "repayNotice": "Teminatınızı geri alabilmeniz için borcunuzun %100'ünü ödemeniz gerekecektir.",
-    "feesNotice": "Borcunuzun %100'ünü ödedikten sonra geri alacağınız teminat üzerinden oluşan ücretler",
-    "refetchQuote": "Teklifi Yeniden Al",
-    "haltedAlert": "THORFi hizmetleri (Lending, Savers ve RUNEPool) şu anda THORChain'de duraklatıldı. Herhangi bir rahatsızlıktan dolayı özür dileriz.",
-    "faq": {
-      "title": "FAQ",
-      "lending": {
-        "title": "THORChain Lending Nedir?",
-        "body": "Borç verme, kullanıcıların yerel teminat yatırmasına ve ardından teminatlandırma oranında (CR) borç oluşturmasına olanak tanır. Kullanıcının hangi L1 varlığını aldığına bakılmaksızın borç her zaman USD (diğer adıyla TOR) cinsinden ifade edilir."
-      },
-      "borrowing": {
-        "title": "Borçlanma nasıl çalışır?",
-        "body": "THORChain'de borç almak, yatırılan varlıklarınızı kredi almak için teminat olarak kullanmayı içerir. Kredi USD (TOR) cinsindendir ve çeşitli L1 varlıklarında alınabilir. Dinamik teminat oranıyla faiz veya tasfiye endişesi olmadan esnek bir şekilde borçlanabilirsiniz"
-      },
-      "repayments": {
-        "title": "Geri ödeme nasıl çalışır?",
-        "body": "THORChain'de geri ödeme esnektir; istediğiniz zaman herhangi bir varlıkta geri ödeme yapmanıza olanak tanır ve bu daha sonra TOR'a dönüştürülür. Geri ödeme tutarı borç bakiyenizden düşülerek, tamamı geri ödendiğinde orantılı teminat tarafınıza iade edilir."
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Geri ödemeler geçici olarak durduruldu.",
-      "borrowingHalted": "Borçlanma geçici olarak durduruldu.",
-      "repaymentsDisabled": "Geri ödemeler geçici olarak devre dışı bırakıldı.",
-      "borrowingDisabled": "Ödünç alma geçici olarak devre dışı bırakıldı.",
-      "amountTooLowToReturnCollateral": "Teminatın iadesi için tutar çok düşük",
-      "amountTooLowToReturnCollateralTooltip": "Geri ödeme teminatınız iade edilemeyecek kadar düşük. Lütfen daha yüksek bir tutarla tekrar deneyin veya kısmi bir tutar ödeyin (bu, teminatınızı iade etmeyecek ancak borcunuzu azaltacaktır).",
-      "amountTooSmallUnknownMinimumTooltip": "Girdiğiniz geri ödeme tutarı çok küçük. Lütfen daha yüksek bir tutarla tekrar deneyin.",
-      "repaymentUnavailableTooltip": "Kredinizi geri ödemeniz henüz mümkün değil. Lütfen geri ödeme kilidi bitene kadar bekleyin.",
-      "repaymentsHaltedTooltip": "Geri ödemeler geçici olarak durduruldu. Lütfen daha sonra tekrar deneyiniz."
-    },
-    "quote": {
-      "collateral": "Kredinize karşılık teminat altına alınacak toplam varlık tutarı",
-      "debt": "Yeni kredi tutarınıza göre borçlu olacağınız toplam borç tutarı",
-      "repaymentLock": "Kredinizi geri ödeyebilmeniz için gereken minimum süre",
-      "collateralizationRatio": "Teminat değerinizin kredi tutarına oranı",
-      "feesPlusSlippage": "L1 ücretleri, kayma ve THORChain likidite ücretleri dahil olmak üzere oluşan toplam ücretler"
-    },
-    "yourLoans": {
-      "yourLoans": "Kredileriniz",
-      "emptyTitle": "Sıfır Krediler Ülkesi!",
-      "emptyBody": "Şu anda herhangi bir krediniz yok gibi görünüyor. Bu finansal zen mi, yoksa bir sonraki büyük borç verme maceranızdan önce sadece bir mola mı? Her iki durumda da sakinliğin tadını çıkarın!"
-    }
+    "poolInformation": "Havuz Bilgileri"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Onay bekleniyor",
@@ -2970,7 +2856,8 @@
         "title": "Riskler ve Hususlar",
         "body": "Likidite havuzları kazanç fırsatları sunarken, kalıcı kayıplar, akıllı sözleşme zayıflıkları ve piyasa dalgalanmaları dahil olmak üzere ilgili risklerin farkında olmak önemlidir. Kullanıcılar katılmadan önce kapsamlı bir araştırma yapmalıdır."
       }
-    }
+    },
+    "haltedDepositTitle": "Para yatırma işlemleri geçici olarak durdurulmuştur."
   },
   "warningAcknowledgement": {
     "understand": "Anladım",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Getiriler",
     "pageSubtitle": "Birden fazla zincirde getiri fırsatlarını keşfedin ve yönetin.",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Getiri",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/uk/main.json b/src/assets/translations/uk/main.json
index 1fe8227ace1..e3ed7310e86 100644
--- a/src/assets/translations/uk/main.json
+++ b/src/assets/translations/uk/main.json
@@ -602,36 +602,18 @@
         "claimNow": "Вивести зараз",
         "claimYour": "Отримайте свою %{opportunity}"
       },
-      "saversVaults": {
-        "description": "Отримуйте дохід від вашого %{asset} через Сховища заощаджень THORChain. Час блокування відсутній, а винагороди накопичуються автоматично. Прибутковість THORChain складається з комісійних за свопи та винагороди за блокчейн. Одностороння дохідність обмежена половиною двосторонньої дохідності постачальників ліквідності.",
-        "runePoolDescription": "RUNEPool дозволяє вам заробляти більше %{asset}, об'єднуючи свій %{asset} з іншими. Вам не потрібно обирати конкретні пули, всі беруть участь у загальній продуктивності.",
-        "runePoolOverviewDescription": "RUNEPool оптимізує використання RUNE, розміщуючи його в усіх пулах ліквідності THORChain з підтримкою пулів. Об'єднуючи RUNE в цих пулах, учасники заробляють комбінований APY, але наражаються на ризик сукупних непостійних втрат. Замість того, щоб обирати окремі пули, користувачі отримують вигоду від загальної ефективності, ефективно інвестуючи в індекс RUNE і всі активи THORChain з підтримкою пулів. RUNEPool оптимізує використання RUNE, вкладаючи його в усі пули ліквідності з підтримкою пулів в THORChain. Об'єднуючи RUNE в цих пулах, учасники заробляють комбінований APY, але наражаються на ризик сукупних непостійних втрат. Замість того, щоб обирати окремі пули, користувачі отримують вигоду від загальної ефективності, ефективно інвестуючи в індекс RUNE і всі активи THORChain з підтримкою POL. Це спрощує забезпечення ліквідності та знижує індивідуальний ризик.",
-        "vaultCap": "Капіталізація Сховища",
-        "vaultCapTooltip": "Поточна максимальна місткість цього сховища",
+      "runePool": {
+        "description": "RUNEPool дозволяє вам заробляти більше %{asset}, об'єднуючи свій %{asset} з іншими. Вам не потрібно обирати конкретні пули, всі беруть участь у загальній продуктивності.",
+        "overviewDescription": "RUNEPool оптимізує використання RUNE, розміщуючи його в усіх пулах ліквідності THORChain з підтримкою пулів. Об'єднуючи RUNE в цих пулах, учасники заробляють комбінований APY, але наражаються на ризик сукупних непостійних втрат. Замість того, щоб обирати окремі пули, користувачі отримують вигоду від загальної ефективності, ефективно інвестуючи в індекс RUNE і всі активи THORChain з підтримкою пулів. RUNEPool оптимізує використання RUNE, вкладаючи його в усі пули ліквідності з підтримкою пулів в THORChain. Об'єднуючи RUNE в цих пулах, учасники заробляють комбінований APY, але наражаються на ризик сукупних непостійних втрат. Замість того, щоб обирати окремі пули, користувачі отримують вигоду від загальної ефективності, ефективно інвестуючи в індекс RUNE і всі активи THORChain з підтримкою POL. Це спрощує забезпечення ліквідності та знижує індивідуальний ризик.",
+        "introducing": "Представляємо RUNEPool",
+        "agree": "Я розумію, що RUNEPool має мінімальний 30-денний термін блокування і підвищений ризик непостійних втрат.",
         "haltedDepositTitle": "Вклади тимчасово зупинені.",
         "disabledDepositTitle": "Депозити тимчасово не працюють.",
         "disabledWithdrawTitle": "Виведення коштів тимчасово відключено.",
         "withdrawLockedTitle": "Ви повинні дочекатися %{timeHuman}, щоб вивести кошти.",
-        "haltedDescription": "Будь ласка, напишіть у твіттері @THORChain, щоб підняти наш рівень!",
-        "protocolFee": "Плата за протокол",
-        "dustAmount": "Сума Dust",
-        "dustAmountTooltip": "Крихітна кількість dust необхідна для ідентифікації вашої адреси, і буде зарезервована для подальшого використання, коли ви захочете здійснити зняття коштів",
-        "sendDustBody": "Вам потрібно відправити трохи dust на цю адресу, щоб мати можливість вилучити кошти.",
-        "sendDust": "Надіслати Dust",
-        "addressToSendTo": "Адреса, на яку надсилати",
-        "introducingSaversVaults": "Представляємо Сховища заощаджень",
-        "introducingRunePool": "Представляємо RUNEPool",
-        "risksBody": {
-          "vaults": "Подивіться на <link>цю статтю</link> щодо ризиків, пов'язаних з використанням ощадних сховищ.",
-          "runePool": "Подивіться на <link>цю статтю</link> за ризики, пов'язані з RUNEPool."
-        },
-        "timeToBreakEven": {
-          "title": "Час для виходу на беззбитковість",
-          "tooltip": "Орієнтовний час для покриття депозитних комісій та отримання прибутку."
-        },
         "cannotDepositWhilePendingTx": "Неможливо внести депозит, доки триває обробка транзакцій",
         "cannotWithdrawWhilePendingTx": "Неможливо вивести кошти, доки триває обробка транзакцій",
-        "agreeRunePool": "Я розумію, що RUNEPool має мінімальний 30-денний термін блокування і підвищений ризик непостійних втрат."
+        "risksBody": "Подивіться на <link>цю статтю</link> за ризики, пов'язані з RUNEPool."
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "Лімітні ордери",
     "buyCrypto": "Купити / продати криптовалюту",
     "buyCryptoShort": "Купити/продати",
-    "lending": "Кредитування",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "Пули",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "Спеціальний"
   },
   "lending": {
-    "lending": "Кредитування",
-    "repaymentAvailable": "Доступне погашення",
-    "repaymentUnavailable": "Погашення ще не доступне",
-    "daysUntilRepayment": "%{numDays} днів до погашення",
-    "repaymentDays": "%{numDays} днів",
-    "lendingBody": "Перелік усіх пулів, які можна позичити під нульову відсоткову ставку та з нульовою ліквідацією.",
-    "collateralValue": "Вартість застави",
-    "collateralValueDescription": "Поточна вартість вашого активу, що використовується як застава",
-    "debtValue": "Сума боргу",
-    "loanToValue": "Кредит до капіталу",
-    "availablePools": "Доступні пули",
-    "pool": "Пул",
-    "poolDepth": "Обсяг пулу",
-    "poolDepthDescription": "Здоров'я пулу",
-    "status": "Статус",
-    "statusDescription": "Статус пулу",
-    "totalDebtBalance": "Загальний залишок боргу",
-    "totalDebtBalanceDescription": "Кумулятивний залишок заборгованості в кредитному пулі",
-    "totalCollateral": "Загальна сума застави",
-    "totalCollateralDescription": "Загальна сума застави, доданої до кредитного пулу",
-    "estCollateralizationRatio": "Приблизний коефіцієнт забезпечення",
-    "estCollateralizationRatioDescription": "Наразі діє фіксований коефіцієнт забезпечення на рівні 200%. У майбутньому динамічний коефіцієнт буде балансувати між максимальним та мінімальним КЗ, виходячи з ринкових умов.",
-    "collateralizationRatio": "коефіцієнт забезпечення",
-    "totalBorrowers": "Всього позичальників",
-    "totalBorrowersDescription": "Кількість позичальників, які беруть участь",
-    "myLoanInformation": "Інформація про мій кредит",
-    "loanInformation": "Короткий огляд кредиту",
-    "poolInformation": "Інформація про пул",
-    "collateralBalance": "Баланс застави",
-    "collateralBalanceDescription": "Загальна сума вашого активу, що наразі перебуває у заставі",
-    "debtBalance": "Залишок боргу",
-    "debtBalanceDescription": "Загальна сума заборгованості за цим кредитом",
-    "repaymentLock": "Блокування виплат",
-    "repaymentLockDescription": "Мінімальний термін, протягом якого ви можете погасити кредит",
-    "receiveCollateral": "Сума застави, яку ви отримаєте назад",
-    "borrow": "Позичити",
-    "repay": "Погасити",
-    "repayAmount": "Сума до погашення",
-    "unlocked": "Розблоковано",
-    "unlockedCollateral": "Розблокована застава",
-    "depositAsset": "Внести %{asset}",
     "switchAssets": "Переключити активи",
-    "outstandingDebt": "Непогашена заборгованість",
-    "outstandingDebtDescription": "Сума застави, яку ви взяли в борг",
-    "collateral": "Забезпечення",
-    "debt": "Борг",
-    "healthy": "Глибина оптимальна, кредити ефективні.",
-    "confirmAndBorrow": "Підтвердити та позичити",
-    "confirmAndRepay": "Підтвердити та погасити",
-    "borrowAgain": "Позичте ще раз",
-    "repayAgain": "Погасити ще раз",
-    "transactionInfo": "Підсумки транзакції",
-    "repayNoticeTitle": "Зачекайте!",
-    "repayNoticeCta": "Я розумію",
-    "repayNotice": "Щоб отримати заставу, вам потрібно буде погасити 100% боргу.",
-    "feesNotice": "Комісії, що виникли у зв'язку із заставою, ви отримаєте назад після погашення 100% вашого боргу",
-    "refetchQuote": "Refetch Quote",
-    "haltedAlert": "Сервіси THORFi (Lending, Savers та RUNEPool) наразі призупинені на THORChain. Приносимо вибачення за тимчасові незручності.",
-    "faq": {
-      "title": "Поширенні запитання",
-      "lending": {
-        "title": "Що таке THORCHCHain кредитування?",
-        "body": "Кредитування дозволяє користувачам вносити власну заставу, а потім створювати борг за коефіцієнтом забезпечення (CR). Борг завжди деномінований у доларах США (так званий TOR), незалежно від того, який актив L1 отримує користувач"
-      },
-      "borrowing": {
-        "title": "Як працює позика?",
-        "body": "Позики в THORChain передбачають використання ваших депонованих активів в якості застави для отримання кредиту. Кредит деномінований в доларах США (TOR) і може бути отриманий в різних активах L1. Завдяки динамічному коефіцієнту забезпечення ви можете гнучко позичати, не турбуючись про відсотки або ліквідацію"
-      },
-      "repayments": {
-        "title": "Як відбувається погашення?",
-        "body": "Погашення в THORchain є гнучким, що дозволяє вам погашати борг у будь-який час після закінчення терміну дії блокування і будь-яким активом, який потім конвертується в TOR. Сума погашення вираховується з балансу вашого боргу, а пропорційне забезпечення повертається вам після повного погашення."
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "Виплати тимчасово припинені.",
-      "borrowingHalted": "Запозичення тимчасово призупинено.",
-      "repaymentsDisabled": "Погашення тимчасово відключено.",
-      "borrowingDisabled": "Кредитування тимчасово відключено.",
-      "amountTooLowToReturnCollateral": "Занадто мала сума для повернення застави",
-      "amountTooLowToReturnCollateralTooltip": "Сума погашення занадто мала, щоб повернути заставу. Будь ласка, спробуйте ще раз з більшою сумою або погасіть частково (це не поверне вам заставу, але зменшить ваш борг).",
-      "amountTooSmallUnknownMinimumTooltip": "Введена сума погашення занадто мала. Будь ласка, спробуйте ще раз з більшою сумою.",
-      "repaymentUnavailableTooltip": "Погасити кредит поки що неможливо. Будь ласка, зачекайте, поки закінчиться блокування погашення.",
-      "repaymentsHaltedTooltip": "Погашення тимчасово призупинено. Будь ласка, спробуйте пізніше."
-    },
-    "quote": {
-      "collateral": "Загальна сума активів, які будуть забезпечені під заставу вашого кредиту",
-      "debt": "Загальний борг, який ви будете винні, виходячи з нової суми кредиту",
-      "repaymentLock": "Мінімальний термін, протягом якого ви можете погасити кредит",
-      "collateralizationRatio": "Співвідношення вартості застави до суми кредиту",
-      "feesPlusSlippage": "Загальна сума комісій, включаючи комісію L1, прослизання та комісію за ліквідність THORChain"
-    },
-    "yourLoans": {
-      "yourLoans": "Ваші позики",
-      "emptyTitle": "Країна нульових кредитів!",
-      "emptyBody": "Схоже, що у вас немає жодних кредитів на даний момент. Це фінансовий дзен чи просто перерва перед наступною великою кредитною пригодою? У будь-якому випадку, насолоджуйтеся спокоєм!"
-    }
+    "poolInformation": "Інформація про пул"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "Очікується підтвердження",
@@ -2970,7 +2856,8 @@
         "title": "Ризики та рекомендації",
         "body": "Хоча пули ліквідності пропонують можливості для заробітку, важливо усвідомлювати ризики, пов'язані з ними, включаючи непостійні втрати, вразливість смарт-контрактів і волатильність ринку. Користувачі повинні провести ретельне дослідження перед тим, як брати участь у пулах."
       }
-    }
+    },
+    "haltedDepositTitle": "Вклади тимчасово зупинені."
   },
   "warningAcknowledgement": {
     "understand": "Я розумію.",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "Дохідність",
     "pageSubtitle": "Відкривайте та керуйте можливостями отримання прибутку в декількох мережах",
-    "actions": {
-    },
+    "actions": {},
     "yield": "Прибутковість",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/assets/translations/zh/main.json b/src/assets/translations/zh/main.json
index 50618da93cc..904bd63c5d2 100644
--- a/src/assets/translations/zh/main.json
+++ b/src/assets/translations/zh/main.json
@@ -602,36 +602,18 @@
         "claimNow": "立即领取",
         "claimYour": "认领你的 %{opportunity}"
       },
-      "saversVaults": {
-        "description": "通过 THORChain 储户金库 赚取你的 %{asset} 收益。无锁定时间，奖励自动累积。 THORChain 上的收益来兑换费用和区块奖励。单面收益率上限为流动性提供者双面收益率的一半。",
-        "runePoolDescription": "RUNEPool 可让你通过与他人共享 %{asset} 来赚取更多 %{asset}。你不必选择特定的池子，每个人都可以分享整体表现。",
-        "runePoolOverviewDescription": "RUNEPool 通过将 RUNE 存入 THORChain 中所有支持 POL 的流动性池来优化 RUNE 的使用。通过在这些池中汇集 RUNE，参与者可以获得综合 APY，但面临总无常损失的风险。用户无需选择单个池，而是从整体表现中受益，有效地投资于 RUNE 指数和所有支持 THORChain POL 的资产。这简化了流动性提供并降低了个人风险。",
-        "vaultCap": "金库容量",
-        "vaultCapTooltip": "该金库当前的最大容量",
+      "runePool": {
+        "description": "RUNEPool 可让你通过与他人共享 %{asset} 来赚取更多 %{asset}。你不必选择特定的池子，每个人都可以分享整体表现。",
+        "overviewDescription": "RUNEPool 通过将 RUNE 存入 THORChain 中所有支持 POL 的流动性池来优化 RUNE 的使用。通过在这些池中汇集 RUNE，参与者可以获得综合 APY，但面临总无常损失的风险。用户无需选择单个池，而是从整体表现中受益，有效地投资于 RUNE 指数和所有支持 THORChain POL 的资产。这简化了流动性提供并降低了个人风险。",
+        "introducing": "介绍 RUNEPool",
+        "agree": "我知道 RUNEPool 有 30 天的最低锁定期，并且存在较高的无常损失风险。",
         "haltedDepositTitle": "充值暂时停止。",
         "disabledDepositTitle": "暂时禁止存款。",
         "disabledWithdrawTitle": "暂时禁止提款。",
         "withdrawLockedTitle": "您必须等待 %{timeHuman} 才能提款。",
-        "haltedDescription": "请 @THORChain 发推文以提高上限！",
-        "protocolFee": "协议费用",
-        "dustAmount": "Dust 数量",
-        "dustAmountTooltip": "需要少量 DUST 来识别你的地址，并将保留以供以后提款时使用",
-        "sendDustBody": "你需要发送一些 dust 到该地址才能提现。",
-        "sendDust": "发送 Dust",
-        "addressToSendTo": "接收地址",
-        "introducingSaversVaults": "介绍储户金库",
-        "introducingRunePool": "介绍 RUNEPool",
-        "risksBody": {
-          "vaults": "参考 <link>这篇文章</link> 以了解与储户金库相关的风险。",
-          "runePool": "参考 <link>这篇文章</link> 以了解与 RUNEPool 相关的风险。"
-        },
-        "timeToBreakEven": {
-          "title": "收支平衡的时候",
-          "tooltip": "预计收益能支付手续费的时间"
-        },
         "cannotDepositWhilePendingTx": "交易待处理时无法充值",
         "cannotWithdrawWhilePendingTx": "交易待处理时无法提现",
-        "agreeRunePool": "我知道 RUNEPool 有 30 天的最低锁定期，并且存在较高的无常损失风险。"
+        "risksBody": "参考 <link>这篇文章</link> 以了解与 RUNEPool 相关的风险。"
       }
     },
     "memoNote": {
@@ -717,8 +699,6 @@
     "limitOrder": "限价订单",
     "buyCrypto": "购买/出售 加密货币",
     "buyCryptoShort": "购买/出售",
-    "lending": "贷款",
-    "thorchainLending": "THORChain Lending",
     "chainflipLending": "Chainflip Lending",
     "pools": "流动性池",
     "rFOX": "rFOX",
@@ -2345,102 +2325,8 @@
     "custom": "自定义"
   },
   "lending": {
-    "lending": "贷款",
-    "repaymentAvailable": "可还款",
-    "repaymentUnavailable": "还款尚未到账",
-    "daysUntilRepayment": "距离还款还有 %{numDays} 天",
-    "repaymentDays": "%{numDays} 天",
-    "lendingBody": "所有可以零利息和零清算借款的资金池的列表。",
-    "collateralValue": "抵押品价值",
-    "collateralValueDescription": "用作抵押品的资产的当前价值",
-    "debtValue": "债务价值",
-    "loanToValue": "贷款价值",
-    "availablePools": "可用池",
-    "pool": "借贷池",
-    "poolDepth": "池深度",
-    "poolDepthDescription": "池的健康状况",
-    "status": "状态",
-    "statusDescription": "池的状态",
-    "totalDebtBalance": "总债务余额",
-    "totalDebtBalanceDescription": "贷款池累计债务余额",
-    "totalCollateral": "抵押品总额",
-    "totalCollateralDescription": "添加到借贷池的总抵押品",
-    "estCollateralizationRatio": "预估抵押比例",
-    "estCollateralizationRatioDescription": "目前抵押率固定为 200%，未来将根据市场情况，动态平衡抵押率的上限和下限。",
-    "collateralizationRatio": "抵押比例",
-    "totalBorrowers": "借款人总数",
-    "totalBorrowersDescription": "参与借款人数量",
-    "myLoanInformation": "我的借贷信息",
-    "loanInformation": "借贷概要",
-    "poolInformation": "池信息",
-    "collateralBalance": "抵押品余额",
-    "collateralBalanceDescription": "你当前作为抵押品持有的资产总额",
-    "debtBalance": "债务余额",
-    "debtBalanceDescription": "你为此贷款所欠的债务总额",
-    "repaymentLock": "还款锁定",
-    "repaymentLockDescription": "你可以偿还贷款的最短期限",
-    "receiveCollateral": "你将收到的抵押品金额",
-    "borrow": "借贷",
-    "repay": "还款",
-    "repayAmount": "还款金额",
-    "unlocked": "解锁",
-    "unlockedCollateral": "解锁抵押品",
-    "depositAsset": "充值 %{asset}",
     "switchAssets": "转换资产",
-    "outstandingDebt": "未尝债务",
-    "outstandingDebtDescription": "你借入的抵押品金额",
-    "collateral": "抵押品",
-    "debt": "债务",
-    "healthy": "深度最佳，贷款高效。",
-    "confirmAndBorrow": "确认并借用",
-    "confirmAndRepay": "确认并偿还",
-    "borrowAgain": "再次借用",
-    "repayAgain": "再次偿还",
-    "transactionInfo": "交易概要",
-    "repayNoticeTitle": "等等！",
-    "repayNoticeCta": "我理解",
-    "repayNotice": "要拿回抵押品，你需要偿还 100% 的债务。",
-    "feesNotice": "偿还 100% 债务后你将收到的抵押品费用",
-    "refetchQuote": "重新获取报价",
-    "haltedAlert": "THORChain 上的 THORFi 服务（借贷、储蓄和 RUNEPool）目前已暂停。我们对造成的任何不便深表歉意。",
-    "faq": {
-      "title": "常见问题",
-      "lending": {
-        "title": "什么是 THORChain 借贷？",
-        "body": "借贷允许用户存入原生抵押品，然后以抵押率（CR）创建债务。无论用户收到什么 L1 资产，债务始终以美元（又名 TOR）计价"
-      },
-      "borrowing": {
-        "title": "借贷如何运作？",
-        "body": "在 THORChain 中借款涉及使用你存入的资产作为抵押品来获取贷款。贷款以美元（TOR）计价，可以多种 L1 资产形式收取。动态抵押比例，灵活借贷，无利息、爆仓之忧"
-      },
-      "repayments": {
-        "title": "还款如何运作？",
-        "body": "THORChain 中的还款非常灵活，允许您在还款锁定到期后随时以任何资产进行还款，然后将其转换为 TOR。还款金额从你的债务余额中扣除，全额还款后按比例返还抵押品"
-      }
-    },
-    "errors": {
-      "repaymentsHalted": "还款暂时停止。",
-      "borrowingHalted": "借款暂时停止。",
-      "repaymentsDisabled": "还款功能暂时禁用。",
-      "borrowingDisabled": "暂时禁止借贷。",
-      "amountTooLowToReturnCollateral": "金额太低，无法退还抵押品",
-      "amountTooLowToReturnCollateralTooltip": "还款金额太低，无法退还你的抵押品。请尝试以更高的金额再试一次，或偿还部分金额（这不会退还你的抵押品，但会减少你的债务）。",
-      "amountTooSmallUnknownMinimumTooltip": "你输入的还款金额太小。请输入更高的金额重试。",
-      "repaymentUnavailableTooltip": "你目前无法偿还贷款。请等到还款锁定期结束。",
-      "repaymentsHaltedTooltip": "还款暂时停止。请稍后重试。"
-    },
-    "quote": {
-      "collateral": "将作为你的贷款担保的总资产金额",
-      "debt": "根据你的新贷款金额，你所欠的债务总额",
-      "repaymentLock": "你可以偿还贷款的最短期限",
-      "collateralizationRatio": "你的抵押品价值与贷款金额的比率",
-      "feesPlusSlippage": "发生的总费用，包括 L1 费用、滑点费用和 THORChain 流动性费用"
-    },
-    "yourLoans": {
-      "yourLoans": "你的贷款",
-      "emptyTitle": "零贷款之地！",
-      "emptyBody": "你目前似乎没有任何贷款。这是金融禅宗还是只是您下一次大型贷款冒险之前的休息？不管怎样，享受平静吧！"
-    }
+    "poolInformation": "池信息"
   },
   "chainflipLending": {
     "awaitingConfirmTitle": "等待确认中",
@@ -2970,7 +2856,8 @@
         "title": "风险和注意事项",
         "body": "虽然流动性池提供了盈利机会，但重要的是要意识到所涉及的风险，包括无常损失、智能合约漏洞和市场波动。用户在参与之前应进行彻底的研究。"
       }
-    }
+    },
+    "haltedDepositTitle": "充值暂时停止。"
   },
   "warningAcknowledgement": {
     "understand": "我理解",
@@ -3475,8 +3362,7 @@
   "yieldXYZ": {
     "pageTitle": "收益",
     "pageSubtitle": "发现并管理跨多条链的收益机会",
-    "actions": {
-    },
+    "actions": {},
     "yield": "收益",
     "apy": "APY",
     "apr": "APR",
diff --git a/src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx b/src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx
index 6ca6d2b399c..e69f588aaea 100644
--- a/src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx
+++ b/src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx
@@ -1,7 +1,7 @@
 import { ArrowForwardIcon, ExternalLinkIcon } from '@chakra-ui/icons'
 import { Button, Flex, Tag, useMediaQuery } from '@chakra-ui/react'
 import type { AssetId } from '@shapeshiftoss/caip'
-import { fromAssetId, thorchainAssetId } from '@shapeshiftoss/caip'
+import { fromAssetId } from '@shapeshiftoss/caip'
 import type { Asset, MarketData } from '@shapeshiftoss/types'
 import { BigAmount } from '@shapeshiftoss/utils'
 import qs from 'qs'
@@ -198,7 +198,7 @@ export const StakingPositionsByProvider: React.FC<StakingPositionsByProviderProp
           case DefiProvider.EthFoxStaking:
             return navigate('/fox-ecosystem')
           case DefiProvider.CosmosSdk:
-          case DefiProvider.ThorchainSavers:
+          case DefiProvider.RunePool:
             return navigate(`/assets/${assetId}`)
           default:
             break
@@ -255,8 +255,7 @@ export const StakingPositionsByProvider: React.FC<StakingPositionsByProviderProp
           const subText = []
           if (opp.version) subText.push(opp.provider)
           if (opp.opportunityName) subText.push(opp.opportunityName)
-          const isRunePool = opp.assetId === thorchainAssetId
-          const providerName = isRunePool ? 'RUNEPool' : opp.version ?? opp.provider
+          const providerName = opp.version ?? opp.provider
           const iconElement = opp.isYield ? (
             <AssetIcon assetId={opp.assetId} size='sm' />
           ) : (
diff --git a/src/components/Layout/Header/Header.tsx b/src/components/Layout/Header/Header.tsx
index 5bcbe78e0fe..eca9a356be2 100644
--- a/src/components/Layout/Header/Header.tsx
+++ b/src/components/Layout/Header/Header.tsx
@@ -122,12 +122,6 @@ export const Header = memo(() => {
         : []),
       { label: 'navBar.tcy', path: '/tcy', icon: TCYIcon },
       { label: 'navBar.pools', path: '/pools', icon: TbPool },
-      {
-        label: isChainflipLendingEnabled ? 'navBar.thorchainLending' : 'navBar.lending',
-        path: '/lending',
-        icon: TbBuildingBank,
-        isDeprecated: isChainflipLendingEnabled,
-      },
       ...(isChainflipLendingEnabled
         ? [
             {
diff --git a/src/components/StakingVaults/PositionTable.tsx b/src/components/StakingVaults/PositionTable.tsx
index cd277609143..4e41556f3a7 100644
--- a/src/components/StakingVaults/PositionTable.tsx
+++ b/src/components/StakingVaults/PositionTable.tsx
@@ -64,6 +64,7 @@ export const PositionTable: React.FC<PositionTableProps> = ({
   }, [basePositions, chainId])
 
   const [processedRows, setProcessedRows] = useState<UnifiedOpportunity[]>([])
+  const [hasProcessedRows, setHasProcessedRows] = useState(false)
   const [, startTransition] = useTransition()
 
   const filterRowsBySearchTerm = useCallback(
@@ -96,6 +97,7 @@ export const PositionTable: React.FC<PositionTableProps> = ({
         ? filterRowsBySearchTerm(filteredByChain, searchQuery)
         : filteredByChain
       setProcessedRows(targetRows)
+      setHasProcessedRows(true)
     })
   }, [filteredByChain, filterRowsBySearchTerm, isSearching, searchQuery])
 
@@ -192,8 +194,8 @@ export const PositionTable: React.FC<PositionTableProps> = ({
   }, [searchQuery])
 
   const isInitialProcessing = useMemo(
-    () => !processedRows.length && !isLoading && filteredByChain.length > 0,
-    [filteredByChain.length, isLoading, processedRows.length],
+    () => !hasProcessedRows && !isLoading && filteredByChain.length > 0,
+    [filteredByChain.length, hasProcessedRows, isLoading],
   )
 
   if (isInitialProcessing) {
diff --git a/src/components/Sweep.tsx b/src/components/Sweep.tsx
index b769945505a..872f8a6149d 100644
--- a/src/components/Sweep.tsx
+++ b/src/components/Sweep.tsx
@@ -11,10 +11,10 @@ import { AssetIcon } from './AssetIcon'
 import { handleSend } from './Modals/Send/utils'
 
 import { Row } from '@/components/Row/Row'
+import { useGetEstimatedFeesQuery } from '@/hooks/queries/useGetEstimatedFeesQuery'
 import { useWallet } from '@/hooks/useWallet/useWallet'
 import { sleep } from '@/lib/poll/poll'
 import { assertGetUtxoChainAdapter } from '@/lib/utils/utxo'
-import { useGetEstimatedFeesQuery } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
 import { selectAssetById } from '@/state/slices/selectors'
 import { useAppSelector } from '@/state/store'
 
diff --git a/src/config.ts b/src/config.ts
index 7ce3704f299..969c282f496 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -153,9 +153,6 @@ const validators = {
   VITE_FEATURE_ZCASH: bool({ default: false }),
   VITE_FEATURE_ZRX_SWAP: bool({ default: false }),
   VITE_FEATURE_THOR_SWAP: bool({ default: false }),
-  VITE_FEATURE_SAVERS_VAULTS: bool({ default: false }),
-  VITE_FEATURE_SAVERS_VAULTS_DEPOSIT: bool({ default: false }),
-  VITE_FEATURE_SAVERS_VAULTS_WITHDRAW: bool({ default: false }),
   VITE_FEATURE_CUSTOM_TOKEN_IMPORT: bool({ default: false }),
   VITE_FEATURE_QUICK_BUY: bool({ default: false }),
   // A flag encapsulating all WalletConnect to dApps - v1 and v2
@@ -222,9 +219,6 @@ const validators = {
   VITE_EXPERIMENTAL_CUSTOM_SEND_NONCE: bool({ default: false }),
   VITE_SNAP_ID: str(),
   VITE_SNAP_VERSION: str(),
-  VITE_FEATURE_THORCHAIN_LENDING: bool({ default: false }),
-  VITE_FEATURE_THORCHAIN_LENDING_BORROW: bool({ default: false }),
-  VITE_FEATURE_THORCHAIN_LENDING_REPAY: bool({ default: false }),
   VITE_FEATURE_THORCHAIN_LP: bool({ default: false }),
   VITE_FEATURE_THORCHAIN_LP_DEPOSIT: bool({ default: false }),
   VITE_FEATURE_THORCHAIN_LP_WITHDRAW: bool({ default: false }),
diff --git a/src/features/defi/contexts/DefiManagerProvider/DefiCommon.ts b/src/features/defi/contexts/DefiManagerProvider/DefiCommon.ts
index e9579b2eab5..16226876d3c 100644
--- a/src/features/defi/contexts/DefiManagerProvider/DefiCommon.ts
+++ b/src/features/defi/contexts/DefiManagerProvider/DefiCommon.ts
@@ -13,7 +13,6 @@ export enum DefiAction {
   Withdraw = 'withdraw',
   GetStarted = 'get-started',
   Claim = 'claim',
-  SendDust = 'send-dust',
 }
 
 export enum DefiStep {
diff --git a/src/features/defi/contexts/DefiManagerProvider/utils.ts b/src/features/defi/contexts/DefiManagerProvider/utils.ts
index d8107bf7048..a0714022c8f 100644
--- a/src/features/defi/contexts/DefiManagerProvider/utils.ts
+++ b/src/features/defi/contexts/DefiManagerProvider/utils.ts
@@ -1,6 +1,6 @@
 import { CosmosManager } from '@/features/defi/providers/cosmos/components/CosmosManager/CosmosManager'
 import { FoxFarmingManager } from '@/features/defi/providers/fox-farming/components/FoxFarmingManager/FoxFarmingManager'
-import { ThorchainSaversManager } from '@/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/ThorchainSaversManager'
+import { RunePoolManager } from '@/features/defi/providers/runepool/components/RunePoolManager/RunePoolManager'
 import { DefiProvider, DefiType } from '@/state/slices/opportunitiesSlice/types'
 
 export const DefiProviderToDefiModuleResolverByDeFiType = {
@@ -10,8 +10,8 @@ export const DefiProviderToDefiModuleResolverByDeFiType = {
   [`${DefiProvider.rFOX}`]: {
     [`${DefiType.Staking}`]: FoxFarmingManager,
   },
-  [DefiProvider.ThorchainSavers]: {
-    [`${DefiType.Staking}`]: ThorchainSaversManager,
+  [DefiProvider.RunePool]: {
+    [`${DefiType.Staking}`]: RunePoolManager,
   },
   [DefiProvider.CosmosSdk]: CosmosManager,
 }
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositCommon.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositCommon.ts
new file mode 100644
index 00000000000..907a4f1d9cb
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositCommon.ts
@@ -0,0 +1,45 @@
+import type { DepositValues } from '@/features/defi/components/Deposit/Deposit'
+import type { StakingEarnOpportunityType } from '@/state/slices/opportunitiesSlice/types'
+
+type RunePoolDepositValues = DepositValues & {
+  txStatus: string
+  networkFeeCryptoBaseUnit: string
+  estimatedGasCryptoPrecision?: string
+  sendMax?: boolean
+}
+
+export type RunePoolDepositState = {
+  opportunity: StakingEarnOpportunityType | null
+  deposit: RunePoolDepositValues
+  loading: boolean
+  txid: string | null
+}
+
+export enum RunePoolDepositActionType {
+  SET_OPPORTUNITY = 'SET_OPPORTUNITY',
+  SET_DEPOSIT = 'SET_DEPOSIT',
+  SET_LOADING = 'SET_LOADING',
+  SET_TXID = 'SET_TXID',
+}
+
+type SetOpportunityAction = {
+  type: RunePoolDepositActionType.SET_OPPORTUNITY
+  payload: StakingEarnOpportunityType
+}
+
+type SetDeposit = {
+  type: RunePoolDepositActionType.SET_DEPOSIT
+  payload: Partial<RunePoolDepositValues>
+}
+
+type SetLoading = {
+  type: RunePoolDepositActionType.SET_LOADING
+  payload: boolean
+}
+
+type SetTxid = {
+  type: RunePoolDepositActionType.SET_TXID
+  payload: string
+}
+
+export type RunePoolDepositActions = SetOpportunityAction | SetDeposit | SetLoading | SetTxid
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositContext.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositContext.ts
new file mode 100644
index 00000000000..7f6bf5c0fe2
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositContext.ts
@@ -0,0 +1,10 @@
+import { createContext } from 'react'
+
+import type { RunePoolDepositActions, RunePoolDepositState } from './DepositCommon'
+
+interface IDepositContext {
+  state: RunePoolDepositState | null
+  dispatch: React.Dispatch<RunePoolDepositActions> | null
+}
+
+export const DepositContext = createContext<IDepositContext>({ state: null, dispatch: null })
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositReducer.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositReducer.ts
new file mode 100644
index 00000000000..360e1b3e61e
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/DepositReducer.ts
@@ -0,0 +1,33 @@
+import type { RunePoolDepositActions, RunePoolDepositState } from './DepositCommon'
+import { RunePoolDepositActionType } from './DepositCommon'
+
+export const initialState: RunePoolDepositState = {
+  txid: null,
+  opportunity: null,
+  loading: false,
+  deposit: {
+    fiatAmount: '',
+    cryptoAmount: '',
+    slippage: '',
+    txStatus: 'pending',
+    networkFeeCryptoBaseUnit: '',
+  },
+}
+
+export const reducer = (
+  state: RunePoolDepositState,
+  action: RunePoolDepositActions,
+): RunePoolDepositState => {
+  switch (action.type) {
+    case RunePoolDepositActionType.SET_OPPORTUNITY:
+      return { ...state, opportunity: { ...state.opportunity, ...action.payload } }
+    case RunePoolDepositActionType.SET_DEPOSIT:
+      return { ...state, deposit: { ...state.deposit, ...action.payload } }
+    case RunePoolDepositActionType.SET_LOADING:
+      return { ...state, loading: action.payload }
+    case RunePoolDepositActionType.SET_TXID:
+      return { ...state, txid: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/ThorchainSaversDeposit.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/RunePoolDeposit.tsx
similarity index 57%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/ThorchainSaversDeposit.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/Deposit/RunePoolDeposit.tsx
index 2d9dc87cbe3..92468e78ea7 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/ThorchainSaversDeposit.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/RunePoolDeposit.tsx
@@ -1,27 +1,23 @@
 import { Center } from '@chakra-ui/react'
 import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId, toAssetId, usdtAssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { skipToken, useQuery } from '@tanstack/react-query'
+import { fromAccountId, toAssetId } from '@shapeshiftoss/caip'
 import qs from 'qs'
 import { useCallback, useEffect, useMemo, useReducer } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { useSelector } from 'react-redux'
 import { useNavigate } from 'react-router-dom'
 
-import { Approve } from './components/Approve'
 import { Confirm } from './components/Confirm'
 import { Deposit } from './components/Deposit'
 import { Status } from './components/Status'
-import { ThorchainSaversDepositActionType } from './DepositCommon'
+import { RunePoolDepositActionType } from './DepositCommon'
 import { DepositContext } from './DepositContext'
 import { initialState, reducer } from './DepositReducer'
 
 import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
 import { CircularProgress } from '@/components/CircularProgress/CircularProgress'
-import type { DefiStepProps, StepComponentProps } from '@/components/DeFi/components/Steps'
+import type { DefiStepProps } from '@/components/DeFi/components/Steps'
 import { Steps } from '@/components/DeFi/components/Steps'
-import { Sweep } from '@/components/Sweep'
 import { DefiModalContent } from '@/features/defi/components/DefiModal/DefiModalContent'
 import { DefiModalHeader } from '@/features/defi/components/DefiModal/DefiModalHeader'
 import type {
@@ -30,10 +26,6 @@ import type {
 } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { DefiAction, DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { getThorchainFromAddress } from '@/lib/utils/thorchain'
-import { isUtxoChainId } from '@/lib/utils/utxo'
-import { getThorchainSaversPosition } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
 import type { StakingId } from '@/state/slices/opportunitiesSlice/types'
 import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
 import {
@@ -42,22 +34,18 @@ import {
   selectHighestStakingBalanceAccountIdByStakingId,
   selectIsPortfolioLoading,
   selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioAccountMetadataByAccountId,
 } from '@/state/slices/selectors'
 import { useAppSelector } from '@/state/store'
 
-type ThorchainSaversDepositProps = {
+type RunePoolDepositProps = {
   accountId: AccountId | undefined
   onAccountIdChange: AccountDropdownProps['onChange']
 }
 
-export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
+export const RunePoolDeposit: React.FC<RunePoolDepositProps> = ({
   accountId,
   onAccountIdChange: handleAccountIdChange,
 }) => {
-  const {
-    state: { wallet },
-  } = useWallet()
   const [state, dispatch] = useReducer(reducer, initialState)
   const translate = useTranslate()
   const { query, location } = useBrowserRouter<DefiQueryParams, DefiParams>()
@@ -72,9 +60,6 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   const marketData = useAppSelector(state => selectMarketDataByAssetIdUserCurrency(state, assetId))
 
-  const isRunePool = assetId === thorchainAssetId
-
-  // user info
   const loading = useSelector(selectIsPortfolioLoading)
 
   const opportunityId: StakingId | undefined = useMemo(
@@ -102,20 +87,10 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
   )
 
   useEffect(() => {
-    ;(() => {
-      if (!opportunityData) return
-      dispatch({ type: ThorchainSaversDepositActionType.SET_OPPORTUNITY, payload: opportunityData })
-    })()
+    if (!opportunityData) return
+    dispatch({ type: RunePoolDepositActionType.SET_OPPORTUNITY, payload: opportunityData })
   }, [opportunityData])
 
-  const underlyingAssetId = useMemo(
-    () => opportunityData?.underlyingAssetId ?? '',
-    [opportunityData?.underlyingAssetId],
-  )
-  const underlyingAsset: Asset | undefined = useAppSelector(state =>
-    selectAssetById(state, underlyingAssetId),
-  )
-
   const handleBack = useCallback(() => {
     navigate({
       pathname: location.pathname,
@@ -126,33 +101,10 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
     })
   }, [navigate, location, query])
 
-  const accountFilter = useMemo(() => ({ accountId }), [accountId])
-  const accountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, accountFilter),
-  )
-
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', accountId, assetId],
-    queryFn:
-      accountId && wallet && accountMetadata
-        ? () =>
-            getThorchainFromAddress({
-              accountId,
-              assetId,
-              getPosition: getThorchainSaversPosition,
-              accountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
-  const makeHandleSweepBack = useCallback(
-    (onNext: StepComponentProps['onNext']) => () => onNext(DefiStep.Info),
-    [],
-  )
-  const makeHandleSweepSeen = useCallback(
-    (onNext: StepComponentProps['onNext']) => () => onNext(DefiStep.Confirm),
-    [],
+  // RUNE is not a UTXO asset - the account address *is* the from address
+  const fromAddress = useMemo(
+    () => (accountId ? fromAccountId(accountId).account : undefined),
+    [accountId],
   )
 
   const StepConfig: DefiStepProps = useMemo(() => {
@@ -160,7 +112,7 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
       [DefiStep.Info]: {
         label: translate('defi.steps.deposit.info.title'),
         description: translate('defi.steps.deposit.info.description', {
-          asset: underlyingAsset?.symbol ?? '',
+          asset: asset?.symbol ?? '',
         }),
         component: ownProps => (
           <Deposit
@@ -171,36 +123,6 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
           />
         ),
       },
-      ...(isUtxoChainId(chainId)
-        ? {
-            [DefiStep.Sweep]: {
-              label: translate('modals.send.consolidate.consolidateFunds'),
-              component: ({ onNext }) => (
-                <Sweep
-                  accountId={accountId}
-                  fromAddress={fromAddress ?? null}
-                  assetId={assetId}
-                  onBack={makeHandleSweepBack(onNext)}
-                  onSweepSeen={makeHandleSweepSeen(onNext)}
-                />
-              ),
-            },
-          }
-        : {}),
-      ...(assetId === usdtAssetId
-        ? {
-            [DefiStep.AllowanceReset]: {
-              label: translate('trade.resetAllowance'),
-              component: ownProps => <Approve {...ownProps} accountId={accountId} isReset />,
-              props: {},
-            },
-          }
-        : {}),
-      [DefiStep.Approve]: {
-        label: translate('defi.steps.approve.title'),
-        component: ownProps => <Approve {...ownProps} accountId={accountId} />,
-        props: {},
-      },
       [DefiStep.Confirm]: {
         label: translate('defi.steps.confirm.title'),
         component: ownProps => <Confirm {...ownProps} accountId={accountId} />,
@@ -210,17 +132,7 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
         component: ownProps => <Status {...ownProps} accountId={accountId} />,
       },
     }
-  }, [
-    translate,
-    underlyingAsset?.symbol,
-    chainId,
-    assetId,
-    accountId,
-    fromAddress,
-    handleAccountIdChange,
-    makeHandleSweepBack,
-    makeHandleSweepSeen,
-  ])
+  }, [translate, asset?.symbol, accountId, fromAddress, handleAccountIdChange])
 
   const value = useMemo(() => ({ state, dispatch }), [state])
 
@@ -236,9 +148,7 @@ export const ThorchainSaversDeposit: React.FC<ThorchainSaversDepositProps> = ({
     <DepositContext.Provider value={value}>
       <DefiModalContent>
         <DefiModalHeader
-          title={translate('modals.deposit.depositInto', {
-            opportunity: isRunePool ? 'RUNEPool' : `${asset.symbol} Vault`,
-          })}
+          title={translate('modals.deposit.depositInto', { opportunity: 'RUNEPool' })}
           onBack={handleBack}
         />
         <Steps steps={StepConfig} />
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Confirm.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Confirm.tsx
new file mode 100644
index 00000000000..01a28f8d571
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Confirm.tsx
@@ -0,0 +1,327 @@
+import { Alert, AlertIcon, Box, Skeleton, Stack, useToast } from '@chakra-ui/react'
+import type { AccountId } from '@shapeshiftoss/caip'
+import { fromAccountId, toAssetId } from '@shapeshiftoss/caip'
+import { SwapperName } from '@shapeshiftoss/swapper'
+import { BigAmount } from '@shapeshiftoss/utils'
+import { useCallback, useContext, useEffect, useMemo } from 'react'
+import { useTranslate } from 'react-polyglot'
+
+import { RunePoolDepositActionType } from '../DepositCommon'
+import { DepositContext } from '../DepositContext'
+
+import { Amount } from '@/components/Amount/Amount'
+import { AssetIcon } from '@/components/AssetIcon'
+import type { StepComponentProps } from '@/components/DeFi/components/Steps'
+import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
+import { Row } from '@/components/Row/Row'
+import { RawText, Text } from '@/components/Text'
+import type { TextPropTypes } from '@/components/Text/Text'
+import { Confirm as ReusableConfirm } from '@/features/defi/components/Confirm/Confirm'
+import { Summary } from '@/features/defi/components/Summary'
+import type {
+  DefiParams,
+  DefiQueryParams,
+} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
+import { useWallet } from '@/hooks/useWallet/useWallet'
+import { bnOrZero } from '@/lib/bignumber/bignumber'
+import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
+import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
+import { MixPanelEvent } from '@/lib/mixpanel/types'
+import { RUNEPOOL_DEPOSIT_MEMO } from '@/lib/utils/thorchain/constants'
+import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
+import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
+import {
+  selectAssetById,
+  selectAssets,
+  selectFeeAssetById,
+  selectMarketDataByAssetIdUserCurrency,
+  selectPortfolioCryptoBalanceByFilter,
+} from '@/state/slices/selectors'
+import { useAppSelector } from '@/state/store'
+
+type ConfirmProps = { accountId: AccountId | undefined } & StepComponentProps
+
+export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
+  const { state, dispatch: contextDispatch } = useContext(DepositContext)
+  const translate = useTranslate()
+  const mixpanel = getMixPanel()
+  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
+  const { chainId, assetNamespace, assetReference } = query
+  const opportunity = useMemo(() => state?.opportunity, [state])
+  const assets = useAppSelector(selectAssets)
+
+  const assetId = toAssetId({
+    chainId,
+    assetNamespace,
+    assetReference,
+  })
+
+  const asset = useAppSelector(state => selectAssetById(state, assetId))
+  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
+  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
+  if (!feeAsset) throw new Error(`Fee asset not found for AssetId ${assetId}`)
+
+  const feeMarketData = useAppSelector(state =>
+    selectMarketDataByAssetIdUserCurrency(state, feeAsset.assetId),
+  )
+
+  const {
+    state: { wallet },
+  } = useWallet()
+
+  const toast = useToast()
+
+  const feeAssetBalanceFilter = useMemo(
+    () => ({ assetId: feeAsset.assetId, accountId }),
+    [accountId, feeAsset.assetId],
+  )
+
+  const feeAssetBalance = useAppSelector(s =>
+    selectPortfolioCryptoBalanceByFilter(s, feeAssetBalanceFilter),
+  )
+
+  // RUNE is not a UTXO asset - the account address *is* the from address
+  const fromAddress = useMemo(
+    () => (accountId ? fromAccountId(accountId).account : undefined),
+    [accountId],
+  )
+
+  const { isEstimatedFeesDataLoading, estimatedFeesData } = useSendThorTx({
+    accountId: accountId ?? null,
+    assetId,
+    amountCryptoBaseUnit: BigAmount.fromPrecision({
+      value: state?.deposit.cryptoAmount,
+      precision: asset.precision,
+    }).toBaseUnit(),
+    action: 'depositRunepool',
+    memo: RUNEPOOL_DEPOSIT_MEMO,
+    fromAddress: fromAddress ?? null,
+  })
+
+  const { amountMinusFeesCryptoBaseUnit, amountMinusFeesCryptoPrecision } = useMemo(() => {
+    const depositAmount = BigAmount.fromPrecision({
+      value: state?.deposit.cryptoAmount,
+      precision: asset.precision,
+    })
+
+    if (!estimatedFeesData)
+      return {
+        amountMinusFeesCryptoBaseUnit: undefined,
+        amountMinusFeesCryptoPrecision: undefined,
+      }
+
+    // RUNE is its own fee asset, so a max deposit needs fees deducted from the sent amount
+    if (state?.deposit.sendMax) {
+      const amountMinusFees = depositAmount.minus(
+        BigAmount.fromBaseUnit({
+          value: estimatedFeesData.txFeeCryptoBaseUnit,
+          precision: asset.precision,
+        }),
+      )
+      return {
+        amountMinusFeesCryptoBaseUnit: amountMinusFees,
+        amountMinusFeesCryptoPrecision: amountMinusFees.toPrecision(),
+      }
+    }
+
+    return {
+      amountMinusFeesCryptoBaseUnit: depositAmount,
+      amountMinusFeesCryptoPrecision: state?.deposit.cryptoAmount,
+    }
+  }, [state?.deposit.cryptoAmount, state?.deposit.sendMax, asset.precision, estimatedFeesData])
+
+  const { executeTransaction } = useSendThorTx({
+    accountId: accountId ?? null,
+    assetId,
+    amountCryptoBaseUnit: amountMinusFeesCryptoBaseUnit?.toBaseUnit() ?? null,
+    action: 'depositRunepool',
+    memo: RUNEPOOL_DEPOSIT_MEMO,
+    fromAddress: fromAddress ?? null,
+    enableEstimateFees: Boolean(!state?.deposit.sendMax),
+  })
+
+  const estimatedGasCryptoPrecision = useMemo(() => {
+    if (!estimatedFeesData) return
+    return BigAmount.fromBaseUnit({
+      value: estimatedFeesData.txFeeCryptoBaseUnit,
+      precision: feeAsset.precision,
+    }).toPrecision()
+  }, [estimatedFeesData, feeAsset.precision])
+
+  useEffect(() => {
+    if (!contextDispatch) return
+    if (!estimatedFeesData) return
+    if (!estimatedGasCryptoPrecision) return
+
+    contextDispatch({
+      type: RunePoolDepositActionType.SET_DEPOSIT,
+      payload: {
+        estimatedGasCryptoPrecision,
+        networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+      },
+    })
+  }, [contextDispatch, estimatedFeesData, estimatedGasCryptoPrecision])
+
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
+    swapperName: SwapperName.Thorchain,
+  })
+
+  const handleDeposit = useCallback(async () => {
+    if (!contextDispatch || !accountId || !assetId) return
+    try {
+      if (!(fromAddress && wallet && opportunity)) return
+
+      if (!state?.deposit.cryptoAmount) {
+        throw new Error('Cannot send 0-value RUNEPool Tx')
+      }
+
+      contextDispatch({ type: RunePoolDepositActionType.SET_LOADING, payload: true })
+
+      // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
+      if (isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
+
+      // Refetch the trading active state JIT to ensure the pool didn't just become halted
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
+
+      const _txId = await executeTransaction()
+      if (!_txId) throw new Error('failed to broadcast transaction')
+
+      contextDispatch({ type: RunePoolDepositActionType.SET_TXID, payload: _txId })
+      onNext(DefiStep.Status)
+      trackOpportunityEvent(
+        MixPanelEvent.DepositConfirm,
+        {
+          opportunity,
+          fiatAmounts: [state.deposit.fiatAmount],
+          cryptoAmounts: [{ assetId, amountCryptoPrecision: state.deposit.cryptoAmount }],
+        },
+        assets,
+      )
+    } catch (error) {
+      console.error(error)
+      toast({
+        position: 'top-right',
+        description: translate('common.transactionFailedBody'),
+        title: translate('common.transactionFailed'),
+        status: 'error',
+      })
+    } finally {
+      contextDispatch({ type: RunePoolDepositActionType.SET_LOADING, payload: false })
+    }
+  }, [
+    contextDispatch,
+    accountId,
+    assetId,
+    fromAddress,
+    wallet,
+    opportunity,
+    state?.deposit.cryptoAmount,
+    state?.deposit.fiatAmount,
+    isTradingActive,
+    refetchIsTradingActive,
+    executeTransaction,
+    onNext,
+    assets,
+    toast,
+    translate,
+  ])
+
+  const handleCancel = useCallback(() => {
+    onNext(DefiStep.Info)
+  }, [onNext])
+
+  const hasEnoughBalanceForGas = useMemo(
+    () =>
+      feeAssetBalance
+        .minus(
+          BigAmount.fromPrecision({
+            value: state?.deposit.estimatedGasCryptoPrecision ?? 0,
+            precision: feeAsset.precision,
+          }),
+        )
+        .gte(0),
+    [feeAssetBalance, state?.deposit.estimatedGasCryptoPrecision, feeAsset],
+  )
+
+  useEffect(() => {
+    if (!hasEnoughBalanceForGas) {
+      mixpanel?.track(MixPanelEvent.InsufficientFunds)
+    }
+  }, [hasEnoughBalanceForGas, mixpanel])
+
+  const notEnoughGasTranslation: TextPropTypes['translation'] = useMemo(
+    () => ['modals.confirm.notEnoughGas', { assetSymbol: feeAsset.symbol }],
+    [feeAsset.symbol],
+  )
+
+  if (!state || !contextDispatch) return null
+
+  return (
+    <ReusableConfirm
+      onCancel={handleCancel}
+      onConfirm={handleDeposit}
+      isDisabled={!hasEnoughBalanceForGas || !fromAddress || isTradingActive === false}
+      loading={state.loading || !amountMinusFeesCryptoBaseUnit || !fromAddress}
+      loadingText={translate('common.confirm')}
+      headerText='modals.confirm.deposit.header'
+    >
+      <Summary>
+        <Row variant='vertical' p={4}>
+          <Row.Label>
+            <Text translation='modals.confirm.amountToDeposit' />
+          </Row.Label>
+          <Row px={0} fontWeight='medium'>
+            <Stack direction='row' alignItems='center'>
+              <AssetIcon size='xs' src={asset.icon} />
+              <RawText>{asset.name}</RawText>
+            </Stack>
+            <Row.Value>
+              <Skeleton isLoaded={!!amountMinusFeesCryptoPrecision}>
+                <Amount.Crypto value={amountMinusFeesCryptoPrecision} symbol={asset.symbol} />
+              </Skeleton>
+            </Row.Value>
+          </Row>
+        </Row>
+        <Row variant='gutter'>
+          <Row.Label>
+            <HelperTooltip label={translate('trade.tooltip.minerFee')}>
+              <Text translation='trade.minerFee' />
+            </HelperTooltip>
+          </Row.Label>
+          <Row.Value>
+            <Skeleton isLoaded={!isEstimatedFeesDataLoading}>
+              <Box textAlign='right'>
+                <Amount.Fiat
+                  fontWeight='bold'
+                  value={bnOrZero(estimatedGasCryptoPrecision)
+                    .times(bnOrZero(feeMarketData?.price))
+                    .toFixed()}
+                />
+                <Amount.Crypto
+                  color='text.subtle'
+                  value={estimatedGasCryptoPrecision ?? '0'}
+                  symbol={feeAsset.symbol}
+                />
+              </Box>
+            </Skeleton>
+          </Row.Value>
+        </Row>
+      </Summary>
+      {!hasEnoughBalanceForGas && (
+        <Alert status='error' borderRadius='lg'>
+          <AlertIcon />
+          <Text translation={notEnoughGasTranslation} />
+        </Alert>
+      )}
+    </ReusableConfirm>
+  )
+}
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Deposit.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Deposit.tsx
new file mode 100644
index 00000000000..de2a7343c21
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Deposit.tsx
@@ -0,0 +1,341 @@
+import type { AccountId } from '@shapeshiftoss/caip'
+import { toAssetId } from '@shapeshiftoss/caip'
+import type { Asset } from '@shapeshiftoss/types'
+import { BigAmount } from '@shapeshiftoss/utils'
+import { useCallback, useContext, useMemo, useState } from 'react'
+import { useTranslate } from 'react-polyglot'
+import { useNavigate } from 'react-router'
+
+import { RunePoolDepositActionType } from '../DepositCommon'
+import { DepositContext } from '../DepositContext'
+
+import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
+import { InfoAcknowledgement } from '@/components/Acknowledgement/InfoAcknowledgement'
+import type { StepComponentProps } from '@/components/DeFi/components/Steps'
+import type { DepositValues } from '@/features/defi/components/Deposit/Deposit'
+import { Deposit as ReusableDeposit } from '@/features/defi/components/Deposit/Deposit'
+import type {
+  DefiParams,
+  DefiQueryParams,
+} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
+import { useNotificationToast } from '@/hooks/useNotificationToast'
+import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
+import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
+import { MixPanelEvent } from '@/lib/mixpanel/types'
+import { RUNEPOOL_DEPOSIT_MEMO } from '@/lib/utils/thorchain/constants'
+import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
+import { useThorchainMimirTimes } from '@/lib/utils/thorchain/hooks/useThorchainMimirTimes'
+import { formatSecondsToDuration } from '@/lib/utils/time'
+import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
+import {
+  selectAssetById,
+  selectAssets,
+  selectEarnUserStakingOpportunityByUserStakingId,
+  selectHighestStakingBalanceAccountIdByStakingId,
+  selectMarketDataByAssetIdUserCurrency,
+  selectPortfolioCryptoBalanceByFilter,
+} from '@/state/slices/selectors'
+import { useAppSelector } from '@/state/store'
+
+type DepositProps = StepComponentProps & {
+  accountId?: AccountId | undefined
+  onAccountIdChange: AccountDropdownProps['onChange']
+  fromAddress: string | undefined
+}
+
+const percentOptions = [0.25, 0.5, 0.75, 1]
+
+export const Deposit: React.FC<DepositProps> = ({
+  accountId,
+  onAccountIdChange: handleAccountIdChange,
+  fromAddress,
+  onNext,
+}) => {
+  const { state, dispatch: contextDispatch } = useContext(DepositContext)
+
+  const toast = useNotificationToast({ desktopPosition: 'top-right' })
+  const translate = useTranslate()
+  const [shouldShowInfoAcknowledgement, setShouldShowInfoAcknowledgement] = useState(false)
+  const [depositValues, setDepositValues] = useState<DepositValues>()
+  const [inputValues, setInputValues] = useState<{
+    fiatAmount: string
+    cryptoAmount: string
+  } | null>(null)
+  const navigate = useNavigate()
+  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
+  const { chainId, assetNamespace, assetReference } = query
+  const assets = useAppSelector(selectAssets)
+
+  const assetId = toAssetId({
+    chainId,
+    assetNamespace,
+    assetReference,
+  })
+
+  const opportunityId = useMemo(
+    () => (assetId ? toOpportunityId({ chainId, assetNamespace, assetReference }) : undefined),
+    [assetId, assetNamespace, assetReference, chainId],
+  )
+  const highestBalanceAccountIdFilter = useMemo(
+    () => ({ stakingId: opportunityId }),
+    [opportunityId],
+  )
+  const highestBalanceAccountId = useAppSelector(state =>
+    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
+  )
+  const opportunityDataFilter = useMemo(
+    () => ({
+      userStakingId: serializeUserStakingId(
+        accountId ?? highestBalanceAccountId ?? '',
+        opportunityId ?? '',
+      ),
+    }),
+    [accountId, highestBalanceAccountId, opportunityId],
+  )
+
+  const opportunityData = useAppSelector(state =>
+    selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter),
+  )
+
+  const asset: Asset | undefined = useAppSelector(state => selectAssetById(state, assetId))
+  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
+
+  const assetMarketData = useAppSelector(state =>
+    selectMarketDataByAssetIdUserCurrency(state, assetId),
+  )
+
+  const balanceFilter = useMemo(() => ({ assetId, accountId }), [accountId, assetId])
+  const balanceCryptoBaseUnit = useAppSelector(state =>
+    selectPortfolioCryptoBalanceByFilter(state, balanceFilter),
+  ).toBaseUnit()
+
+  const { data: thorchainMimirTimes, isLoading: isThorchainMimirTimesLoading } =
+    useThorchainMimirTimes()
+
+  const { estimatedFeesData, isEstimatedFeesDataLoading, outboundFeeCryptoBaseUnit } =
+    useSendThorTx({
+      assetId,
+      accountId: accountId ?? null,
+      amountCryptoBaseUnit: BigAmount.fromPrecision({
+        value: inputValues?.cryptoAmount,
+        precision: asset.precision,
+      }).toBaseUnit(),
+      memo: RUNEPOOL_DEPOSIT_MEMO,
+      fromAddress: fromAddress ?? null,
+      action: 'depositRunepool',
+      enableEstimateFees: Boolean(bnOrZero(inputValues?.cryptoAmount).gt(0)),
+    })
+
+  const handleContinue = useCallback(
+    (formValues: DepositValues) => {
+      if (!accountId) return
+      if (!inputValues) return
+      if (!opportunityData) return
+      if (!contextDispatch) return
+      if (!estimatedFeesData) return
+
+      contextDispatch({ type: RunePoolDepositActionType.SET_DEPOSIT, payload: formValues })
+      contextDispatch({ type: RunePoolDepositActionType.SET_LOADING, payload: true })
+
+      try {
+        contextDispatch({
+          type: RunePoolDepositActionType.SET_DEPOSIT,
+          payload: {
+            estimatedGasCryptoPrecision: BigAmount.fromBaseUnit({
+              value: estimatedFeesData.txFeeCryptoBaseUnit,
+              precision: asset.precision,
+            }).toPrecision(),
+            networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+          },
+        })
+
+        onNext(DefiStep.Confirm)
+        trackOpportunityEvent(
+          MixPanelEvent.DepositContinue,
+          {
+            opportunity: opportunityData,
+            fiatAmounts: [formValues.fiatAmount],
+            cryptoAmounts: [{ assetId, amountCryptoPrecision: formValues.cryptoAmount }],
+          },
+          assets,
+        )
+      } catch (error) {
+        console.error(error)
+        toast({
+          description: translate('common.somethingWentWrongBody'),
+          title: translate('common.somethingWentWrong'),
+          status: 'error',
+        })
+      } finally {
+        contextDispatch({ type: RunePoolDepositActionType.SET_LOADING, payload: false })
+      }
+    },
+    [
+      accountId,
+      inputValues,
+      opportunityData,
+      contextDispatch,
+      estimatedFeesData,
+      asset.precision,
+      onNext,
+      assetId,
+      assets,
+      toast,
+      translate,
+    ],
+  )
+
+  const handleCancel = useCallback(() => {
+    navigate(-1)
+  }, [navigate])
+
+  const balanceCryptoPrecision = useMemo(
+    () =>
+      bn(
+        BigAmount.fromBaseUnit({
+          value: balanceCryptoBaseUnit,
+          precision: asset.precision,
+        }).toPrecision(),
+      ),
+    [balanceCryptoBaseUnit, asset.precision],
+  )
+  const fiatAmountAvailable = useMemo(
+    () => bnOrZero(balanceCryptoPrecision).times(bnOrZero(assetMarketData?.price)),
+    [balanceCryptoPrecision, assetMarketData?.price],
+  )
+
+  const validateCryptoAmount = useCallback(
+    (value: string) => {
+      const valueCryptoPrecision = bnOrZero(value)
+      if (balanceCryptoPrecision.isZero() || balanceCryptoPrecision.lt(value))
+        return 'common.insufficientFunds'
+      if (valueCryptoPrecision.isEqualTo(0)) return ''
+
+      // RUNE is its own fee asset, so the outbound fee is denominated in RUNE directly
+      const isBelowOutboundFee =
+        bnOrZero(outboundFeeCryptoBaseUnit).gt(0) &&
+        bn(BigAmount.fromPrecision({ value, precision: asset.precision }).toBaseUnit()).lt(
+          outboundFeeCryptoBaseUnit ?? '0',
+        )
+
+      if (isBelowOutboundFee) {
+        const minLimitCryptoPrecision = BigAmount.fromBaseUnit({
+          value: outboundFeeCryptoBaseUnit ?? '0',
+          precision: asset.precision,
+        }).toPrecision()
+        return translate('trade.errors.amountTooSmall', {
+          minLimit: `${minLimitCryptoPrecision} ${asset.symbol}`,
+        })
+      }
+
+      return true
+    },
+    [asset.precision, asset.symbol, balanceCryptoPrecision, outboundFeeCryptoBaseUnit, translate],
+  )
+
+  const validateFiatAmount = useCallback(
+    (value: string) => {
+      const fiatBalance = balanceCryptoPrecision.times(bnOrZero(assetMarketData?.price))
+      if (fiatBalance.isZero() || fiatBalance.lt(value)) return 'common.insufficientFunds'
+
+      return true
+    },
+    [assetMarketData?.price, balanceCryptoPrecision],
+  )
+
+  const handlePercentClick = useCallback(
+    (percent: number) => {
+      const percentageCryptoAmount = balanceCryptoPrecision.times(percent).dp(asset.precision)
+      const percentageFiatAmount = percentageCryptoAmount.times(bnOrZero(assetMarketData?.price))
+
+      if (contextDispatch) {
+        contextDispatch({
+          type: RunePoolDepositActionType.SET_DEPOSIT,
+          payload: { sendMax: percent === 1 },
+        })
+      }
+
+      return Promise.resolve({
+        percentageCryptoAmount: percentageCryptoAmount.toFixed(),
+        percentageFiatAmount: percentageFiatAmount.toFixed(),
+      })
+    },
+    [asset.precision, assetMarketData?.price, balanceCryptoPrecision, contextDispatch],
+  )
+
+  const handleInputChange = useCallback(
+    ({ fiatAmount, cryptoAmount }: { fiatAmount: string; cryptoAmount: string }) => {
+      setInputValues({ fiatAmount, cryptoAmount })
+    },
+    [],
+  )
+
+  const cryptoInputValidation = useMemo(
+    () => ({
+      required: true,
+      validate: { validateCryptoAmount },
+    }),
+    [validateCryptoAmount],
+  )
+
+  const fiatInputValidation = useMemo(
+    () => ({
+      required: true,
+      validate: { validateFiatAmount },
+    }),
+    [validateFiatAmount],
+  )
+
+  const handleContinueOrAcknowledgement = useCallback(
+    (formValues: DepositValues) => {
+      setDepositValues(formValues)
+      if (thorchainMimirTimes?.runePoolDepositMaturityTime) {
+        setShouldShowInfoAcknowledgement(true)
+        return
+      }
+
+      handleContinue(formValues)
+    },
+    [thorchainMimirTimes?.runePoolDepositMaturityTime, handleContinue],
+  )
+
+  const handleAcknowledge = useCallback(() => {
+    if (!depositValues) return
+    handleContinue(depositValues)
+  }, [depositValues, handleContinue])
+
+  if (!state || !contextDispatch || !opportunityData) return null
+
+  return (
+    <>
+      <InfoAcknowledgement
+        message={translate('defi.liquidityLockupWarning', {
+          time: formatSecondsToDuration(thorchainMimirTimes?.runePoolDepositMaturityTime ?? 0),
+        })}
+        onAcknowledge={handleAcknowledge}
+        shouldShowAcknowledgement={shouldShowInfoAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowInfoAcknowledgement}
+      />
+      <ReusableDeposit
+        accountId={accountId}
+        onAccountIdChange={handleAccountIdChange}
+        asset={asset}
+        apy={opportunityData.apy ?? undefined}
+        cryptoAmountAvailable={balanceCryptoPrecision.toPrecision()}
+        cryptoInputValidation={cryptoInputValidation}
+        fiatAmountAvailable={fiatAmountAvailable.toFixed(2)}
+        fiatInputValidation={fiatInputValidation}
+        marketData={assetMarketData}
+        onCancel={handleCancel}
+        onPercentClick={handlePercentClick}
+        onContinue={handleContinueOrAcknowledgement}
+        onChange={handleInputChange}
+        percentOptions={percentOptions}
+        enableSlippage={false}
+        isLoading={isEstimatedFeesDataLoading || isThorchainMimirTimesLoading || state.loading}
+      />
+    </>
+  )
+}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Status.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Status.tsx
similarity index 81%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Status.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Status.tsx
index 1204460123c..f25e6402c0d 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Status.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Deposit/components/Status.tsx
@@ -1,14 +1,13 @@
 import { CheckIcon, CloseIcon, ExternalLinkIcon } from '@chakra-ui/icons'
 import { Box, Button, Link, Stack } from '@chakra-ui/react'
 import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId } from '@shapeshiftoss/caip'
 import { TxStatus as TxStatusType } from '@shapeshiftoss/unchained-client'
 import { BigAmount } from '@shapeshiftoss/utils'
 import { useCallback, useContext, useEffect } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { useNavigate } from 'react-router-dom'
 
-import { ThorchainSaversDepositActionType } from '../DepositCommon'
+import { RunePoolDepositActionType } from '../DepositCommon'
 import { DepositContext } from '../DepositContext'
 
 import { Amount } from '@/components/Amount/Amount'
@@ -21,7 +20,6 @@ import { Summary } from '@/features/defi/components/Summary'
 import { TxStatus } from '@/features/defi/components/TxStatus/TxStatus'
 import { bnOrZero } from '@/lib/bignumber/bignumber'
 import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
 import { MixPanelEvent } from '@/lib/mixpanel/types'
 import { waitForThorchainUpdate } from '@/lib/utils/thorchain'
 import { opportunitiesApi } from '@/state/slices/opportunitiesSlice/opportunitiesApiSlice'
@@ -42,7 +40,6 @@ const externalLinkIcon = <ExternalLinkIcon />
 
 export const Status: React.FC<StatusProps> = ({ accountId }) => {
   const translate = useTranslate()
-  const mixpanel = getMixPanel()
   const { state, dispatch: contextDispatch } = useContext(DepositContext)
   const navigate = useNavigate()
 
@@ -52,8 +49,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   const assets = useAppSelector(selectAssets)
   const assetId = state?.opportunity?.assetId
 
-  const isRunePool = assetId === thorchainAssetId
-
   const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))
   const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId ?? ''))
 
@@ -63,9 +58,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   const feeMarketData = useAppSelector(state =>
     selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
   )
-  const marketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId ?? ''),
-  )
 
   useEffect(() => {
     if (!(contextDispatch && state?.txid?.length && accountId)) return
@@ -85,7 +77,7 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
               [
                 {
                   accountId,
-                  defiProvider: DefiProvider.ThorchainSavers,
+                  defiProvider: DefiProvider.RunePool,
                   defiType: DefiType.Staking,
                 },
               ],
@@ -95,7 +87,7 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
         }
 
         contextDispatch({
-          type: ThorchainSaversDepositActionType.SET_DEPOSIT,
+          type: RunePoolDepositActionType.SET_DEPOSIT,
           payload: {
             txStatus: thorchainTxStatus === TxStatusType.Confirmed ? 'success' : 'failed',
           },
@@ -105,8 +97,10 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   }, [accountId, appDispatch, contextDispatch, getOpportunitiesUserData, state?.txid])
 
   const handleViewPosition = useCallback(() => {
-    navigate('/wallet/earn')
-  }, [navigate])
+    if (!accountId) return
+    // The full-page earn dashboard is mobile-only - the account page shows the position on both layouts
+    navigate(`/accounts/${accountId}`)
+  }, [accountId, navigate])
 
   const handleCancel = useCallback(() => {
     navigate(-1)
@@ -128,7 +122,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   }, [
     assets,
     assetId,
-    mixpanel,
     state?.opportunity,
     state?.deposit.cryptoAmount,
     state?.deposit.fiatAmount,
@@ -144,7 +137,7 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
           statusText: StatusTextEnum.success,
           statusIcon: <CheckIcon color='white' />,
           statusBody: translate('modals.deposit.status.success', {
-            opportunity: isRunePool ? `RUNEPool` : `${asset.name} Vault`,
+            opportunity: 'RUNEPool',
           }),
           statusBg: 'green.500',
         }
@@ -168,7 +161,9 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   return (
     <TxStatus
       onClose={handleCancel}
-      onContinue={state.deposit.txStatus === 'success' ? handleViewPosition : undefined}
+      onContinue={
+        state.deposit.txStatus === 'success' && accountId ? handleViewPosition : undefined
+      }
       loading={!['success', 'failed'].includes(state.deposit.txStatus)}
       statusText={statusText}
       statusIcon={statusIcon}
@@ -197,36 +192,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
             </Row.Value>
           </Row>
         </Row>
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.protocolFee')}>
-              <Text translation={'trade.protocolFee'} />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Box textAlign='right'>
-              <Amount.Fiat
-                fontWeight='bold'
-                value={bnOrZero(
-                  BigAmount.fromBaseUnit({
-                    value: state.deposit.protocolFeeCryptoBaseUnit ?? '0',
-                    precision: asset.precision,
-                  }).toPrecision(),
-                )
-                  .times(bnOrZero(marketData?.price))
-                  .toFixed()}
-              />
-              <Amount.Crypto
-                color='text.subtle'
-                value={BigAmount.fromBaseUnit({
-                  value: state.deposit.protocolFeeCryptoBaseUnit ?? '0',
-                  precision: asset.precision,
-                }).toPrecision()}
-                symbol={asset.symbol}
-              />
-            </Box>
-          </Row.Value>
-        </Row>
         <Row variant='gutter'>
           <Row.Label>
             <HelperTooltip label={translate('trade.tooltip.minerFee')}>
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversEmpty.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolEmpty.tsx
similarity index 74%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversEmpty.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolEmpty.tsx
index d4eeb9825a1..a098eb18d01 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversEmpty.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolEmpty.tsx
@@ -10,12 +10,11 @@ import {
   useColorModeValue,
 } from '@chakra-ui/react'
 import type { AssetId } from '@shapeshiftoss/caip'
-import { thorchainAssetId } from '@shapeshiftoss/caip'
 import type { ChangeEvent } from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslate } from 'react-polyglot'
 
-import SaversVaultTop from '@/assets/savers-vault-top.png'
+import RunePoolTop from '@/assets/runepool-top.png'
 import { AssetIcon } from '@/components/AssetIcon'
 import { FiatRampAction } from '@/components/Modals/FiatRamps/FiatRampsCommon'
 import { RawText, Text } from '@/components/Text'
@@ -32,7 +31,7 @@ import {
 } from '@/state/slices/selectors'
 import { useAppSelector } from '@/state/store'
 
-type ThorchainSaversEmptyProps = {
+type RunePoolEmptyProps = {
   assetId: AssetId
   onClick?: () => void
 }
@@ -41,7 +40,7 @@ type ThorchainSaversEmptyProps = {
 const RUNEPOOL_ARTICLE_LINK =
   'https://gitlab.com/thorchain/thornode/-/blob/develop/docs/concepts/rune-pool.md'
 
-export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyProps) => {
+export const RunePoolEmpty = ({ assetId, onClick }: RunePoolEmptyProps) => {
   const translate = useTranslate()
   const { open: openFiatRamp } = useModal('fiatRamps')
   const asset = useAppSelector(state => selectAssetById(state, assetId))
@@ -57,7 +56,6 @@ export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyP
   )
   const backgroundColor = useColorModeValue('gray.100', 'darkNeutralAlpha.700')
   const checkboxBackground = useColorModeValue('white', 'transparent')
-  const isRunePool = assetId === thorchainAssetId
 
   const checkboxStyles = useMemo(
     () => ({
@@ -89,26 +87,17 @@ export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyP
     [asset?.symbol],
   )
 
-  const saversVaultDescriptionTranslation: TextPropTypes['translation'] = useMemo(
-    () => [
-      isRunePool
-        ? 'defi.modals.saversVaults.runePoolDescription'
-        : 'defi.modals.saversVaults.description',
-      { asset: asset?.symbol },
-    ],
-    [asset?.symbol, isRunePool],
+  const descriptionTranslation: TextPropTypes['translation'] = useMemo(
+    () => ['defi.modals.runePool.description', { asset: asset?.symbol }],
+    [asset?.symbol],
   )
 
-  const risksBodyTranslationComponents: TextPropTypes['components'] = useMemo(() => {
-    // @TODO: update the RUNEPool link when a better article exists
-    const linkHref = isRunePool
-      ? RUNEPOOL_ARTICLE_LINK
-      : 'https://medium.com/thorchain/thorchain-savers-vaults-fc3f086b4057'
-
-    return {
-      link: <Link color={linkColor} isExternal href={linkHref} me={1}></Link>,
-    }
-  }, [isRunePool, linkColor])
+  const risksBodyTranslationComponents: TextPropTypes['components'] = useMemo(
+    () => ({
+      link: <Link color={linkColor} isExternal href={RUNEPOOL_ARTICLE_LINK} me={1}></Link>,
+    }),
+    [linkColor],
+  )
 
   const renderFooter = useMemo(() => {
     if (!asset) return
@@ -125,19 +114,17 @@ export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyP
             {translate('common.buyNow')}
           </Button>
         </Alert>
-        {isRunePool ? (
-          <Box borderRadius='xl' background={backgroundColor}>
-            <Checkbox sx={checkboxStyles} isChecked={hasAgreed} onChange={handleHasAgreed} p={4}>
-              {translate('defi.modals.saversVaults.agreeRunePool')}
-            </Checkbox>
-          </Box>
-        ) : null}
+        <Box borderRadius='xl' background={backgroundColor}>
+          <Checkbox sx={checkboxStyles} isChecked={hasAgreed} onChange={handleHasAgreed} p={4}>
+            {translate('defi.modals.runePool.agree')}
+          </Checkbox>
+        </Box>
         <Tooltip label={translate('defi.noAccountsOpportunities')} isDisabled={hasAccounts}>
           <Button
             size='lg'
             width='full'
             colorScheme='blue'
-            isDisabled={!hasAccounts || (!hasAgreed && isRunePool)}
+            isDisabled={!hasAccounts || !hasAgreed}
             onClick={onClick}
           >
             <Text translation='common.continue' />
@@ -156,25 +143,18 @@ export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyP
     handleHasAgreed,
     hasAgreed,
     backgroundColor,
-    isRunePool,
     onClick,
     checkboxStyles,
   ])
 
   const emptyOverviewAssets = useMemo(() => (asset ? [asset] : []), [asset])
 
-  const description = useMemo(() => {
-    if (isRunePool) return 'defi.modals.saversVaults.introducingRunePool'
-
-    return 'defi.modals.saversVaults.introducingSaversVaults'
-  }, [isRunePool])
-
   if (!asset) return null
 
   return (
     <DefiModalContent
       borderRadius='2xl'
-      backgroundImage={SaversVaultTop}
+      backgroundImage={RunePoolTop}
       backgroundSize='cover'
       backgroundPosition='center -160px'
       backgroundRepeat='no-repeat'
@@ -185,24 +165,20 @@ export const ThorchainSaversEmpty = ({ assetId, onClick }: ThorchainSaversEmptyP
             fontWeight='bold'
             fontSize='xl'
             letterSpacing='0.012em'
-            translation={description}
+            translation='defi.modals.runePool.introducing'
             textShadow={`0 2px 2px var(${textShadow})`}
           />
 
           <Text
             fontSize='lg'
-            translation={saversVaultDescriptionTranslation}
+            translation={descriptionTranslation}
             textShadow={`0 2px 2px var(${textShadow})`}
             letterSpacing='0.009em'
           />
           <Text
             as={RawText}
             color='text.subtle'
-            translation={
-              isRunePool
-                ? 'defi.modals.saversVaults.risksBody.runePool'
-                : 'defi.modals.saversVaults.risksBody.vaults'
-            }
+            translation='defi.modals.runePool.risksBody'
             components={risksBodyTranslationComponents}
           />
         </Stack>
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolOverview.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolOverview.tsx
new file mode 100644
index 00000000000..dfe592342b2
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Overview/RunePoolOverview.tsx
@@ -0,0 +1,277 @@
+import { ArrowDownIcon, ArrowUpIcon } from '@chakra-ui/icons'
+import { Center } from '@chakra-ui/react'
+import { QueryStatus } from '@reduxjs/toolkit/query'
+import type { AccountId } from '@shapeshiftoss/caip'
+import { fromAccountId, toAssetId } from '@shapeshiftoss/caip'
+import { SwapperName } from '@shapeshiftoss/swapper'
+import { TxStatus } from '@shapeshiftoss/unchained-client'
+import { BigAmount } from '@shapeshiftoss/utils'
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslate } from 'react-polyglot'
+
+import { RunePoolEmpty } from './RunePoolEmpty'
+
+import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
+import { CircularProgress } from '@/components/CircularProgress/CircularProgress'
+import type { DefiButtonProps } from '@/features/defi/components/DefiActionButtons'
+import { Overview } from '@/features/defi/components/Overview/Overview'
+import type {
+  DefiParams,
+  DefiQueryParams,
+} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { DefiAction } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
+import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
+import { bnOrZero } from '@/lib/bignumber/bignumber'
+import { formatSecondsToDuration } from '@/lib/utils/time'
+import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
+import { DefiProvider, DefiType } from '@/state/slices/opportunitiesSlice/types'
+import {
+  isRunePoolUserStakingOpportunity,
+  makeDefiProviderDisplayName,
+  serializeUserStakingId,
+  toOpportunityId,
+} from '@/state/slices/opportunitiesSlice/utils'
+import {
+  selectAssetById,
+  selectEarnUserStakingOpportunityByUserStakingId,
+  selectFirstAccountIdByChainId,
+  selectHighestStakingBalanceAccountIdByStakingId,
+  selectMarketDataByAssetIdUserCurrency,
+  selectOpportunitiesApiQueriesByFilter,
+  selectTxsByFilter,
+  selectUnderlyingStakingAssetsWithBalancesAndIcons,
+} from '@/state/slices/selectors'
+import { useAppSelector } from '@/state/store'
+
+type OverviewProps = {
+  accountId: AccountId | undefined
+  onAccountIdChange: AccountDropdownProps['onChange']
+}
+
+export const RunePoolOverview: React.FC<OverviewProps> = ({
+  accountId,
+  onAccountIdChange: handleAccountIdChange,
+}) => {
+  const translate = useTranslate()
+  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
+  const [hideEmptyState, setHideEmptyState] = useState(false)
+  const { chainId, assetReference, assetNamespace } = query
+
+  const assetId = toAssetId({
+    chainId,
+    assetNamespace,
+    assetReference,
+  })
+  const asset = useAppSelector(state => selectAssetById(state, assetId))
+
+  const marketData = useAppSelector(state => selectMarketDataByAssetIdUserCurrency(state, assetId))
+
+  const opportunityId = useMemo(
+    () => toOpportunityId({ chainId, assetNamespace, assetReference }),
+    [assetNamespace, assetReference, chainId],
+  )
+  const highestBalanceAccountIdFilter = useMemo(
+    () => ({ stakingId: opportunityId }),
+    [opportunityId],
+  )
+  const highestStakingBalanceAccountId = useAppSelector(state =>
+    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
+  )
+  const defaultAccountId = useAppSelector(state => selectFirstAccountIdByChainId(state, chainId))
+  const maybeAccountId = useMemo(
+    () => accountId ?? highestStakingBalanceAccountId ?? defaultAccountId,
+    [accountId, defaultAccountId, highestStakingBalanceAccountId],
+  )
+
+  const { isTradingActive, isLoading: isTradingActiveLoading } = useIsTradingActive({
+    assetId,
+    swapperName: SwapperName.Thorchain,
+  })
+
+  const isRunePoolDepositEnabled = useFeatureFlag('RunePoolDeposit')
+  const isRunepoolWithdrawEnabled = useFeatureFlag('RunePoolWithdraw')
+
+  useEffect(() => {
+    if (!maybeAccountId) return
+    handleAccountIdChange(maybeAccountId)
+  }, [handleAccountIdChange, maybeAccountId])
+
+  const opportunityDataFilter = useMemo(() => {
+    if (!maybeAccountId?.length) return
+
+    return {
+      userStakingId: serializeUserStakingId(
+        maybeAccountId,
+        toOpportunityId({
+          chainId,
+          assetNamespace,
+          assetReference,
+        }),
+      ),
+    }
+  }, [assetNamespace, assetReference, chainId, maybeAccountId])
+
+  const earnOpportunityData = useAppSelector(state =>
+    opportunityDataFilter
+      ? selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter)
+      : undefined,
+  )
+
+  const stakedFiatBalance = useMemo(() => {
+    if (!asset) return '0'
+
+    const cryptoAmount = BigAmount.fromBaseUnit({
+      value: earnOpportunityData?.stakedAmountCryptoBaseUnit ?? '0',
+      precision: asset.precision,
+    }).toPrecision()
+    return bnOrZero(cryptoAmount)
+      .times(bnOrZero(marketData?.price))
+      .toString()
+  }, [asset, marketData, earnOpportunityData?.stakedAmountCryptoBaseUnit])
+
+  const underlyingAssetsWithBalancesAndIcons = useAppSelector(state =>
+    opportunityDataFilter
+      ? selectUnderlyingStakingAssetsWithBalancesAndIcons(state, opportunityDataFilter)
+      : undefined,
+  )
+
+  const hasPendingTxsFilter = useMemo(
+    () => ({
+      accountId,
+      assetId,
+    }),
+    [accountId, assetId],
+  )
+  const hasPendingTxs = useAppSelector(state => selectTxsByFilter(state, hasPendingTxsFilter)).some(
+    tx => tx.status === TxStatus.Pending,
+  )
+
+  const pendingQueriesFilter = useMemo(
+    () => ({
+      defiProvider: DefiProvider.RunePool,
+      defiType: DefiType.Staking,
+      queryStatus: QueryStatus.pending,
+    }),
+    [],
+  )
+  const hasPendingQueries = Boolean(
+    useAppSelector(state => selectOpportunitiesApiQueriesByFilter(state, pendingQueriesFilter))
+      .length,
+  )
+
+  const remainingLockupTime = useMemo(() => {
+    if (!isRunePoolUserStakingOpportunity(earnOpportunityData)) return 0
+    return Math.max(earnOpportunityData.dateUnlocked - Math.floor(Date.now() / 1000), 0)
+  }, [earnOpportunityData])
+
+  // RUNE is not a UTXO asset - the account address *is* the position address
+  const positionAddress = useMemo(
+    () => (maybeAccountId ? fromAccountId(maybeAccountId).account : undefined),
+    [maybeAccountId],
+  )
+
+  const menu: DefiButtonProps[] = useMemo(() => {
+    if (!earnOpportunityData) return []
+
+    return [
+      {
+        label: 'common.deposit',
+        icon: <ArrowUpIcon />,
+        action: DefiAction.Deposit,
+        isDisabled:
+          hasPendingTxs ||
+          hasPendingQueries ||
+          isTradingActive === false ||
+          !isRunePoolDepositEnabled,
+        toolTip: (() => {
+          if (!isRunePoolDepositEnabled)
+            return translate('defi.modals.runePool.disabledDepositTitle')
+          if (isTradingActive === false) return translate('defi.modals.runePool.haltedDepositTitle')
+          if (hasPendingTxs || hasPendingQueries)
+            return translate('defi.modals.runePool.cannotDepositWhilePendingTx')
+        })(),
+      },
+      {
+        label: 'common.withdraw',
+        icon: <ArrowDownIcon />,
+        action: DefiAction.Withdraw,
+        isDisabled:
+          hasPendingTxs ||
+          hasPendingQueries ||
+          !isRunepoolWithdrawEnabled ||
+          Boolean(remainingLockupTime),
+        toolTip: (() => {
+          if (!isRunepoolWithdrawEnabled) {
+            return translate('defi.modals.runePool.disabledWithdrawTitle')
+          }
+
+          if (remainingLockupTime) {
+            return translate('defi.modals.runePool.withdrawLockedTitle', {
+              timeHuman: formatSecondsToDuration(remainingLockupTime),
+            })
+          }
+
+          if (hasPendingTxs || hasPendingQueries) {
+            return translate('defi.modals.runePool.cannotWithdrawWhilePendingTx')
+          }
+        })(),
+      },
+    ]
+  }, [
+    earnOpportunityData,
+    hasPendingQueries,
+    hasPendingTxs,
+    isRunePoolDepositEnabled,
+    isRunepoolWithdrawEnabled,
+    isTradingActive,
+    remainingLockupTime,
+    translate,
+  ])
+
+  const description = useMemo(
+    () => ({
+      description: translate('defi.modals.runePool.overviewDescription'),
+      isLoaded: true,
+      isTrustedDescription: true,
+    }),
+    [translate],
+  )
+
+  const handleRunePoolEmptyClick = useCallback(() => setHideEmptyState(true), [])
+
+  if (!earnOpportunityData?.isLoaded || isTradingActiveLoading) {
+    return (
+      <Center minW='500px' minH='350px'>
+        <CircularProgress />
+      </Center>
+    )
+  }
+
+  if (bnOrZero(stakedFiatBalance).eq(0) && !hideEmptyState) {
+    return <RunePoolEmpty assetId={assetId} onClick={handleRunePoolEmptyClick} />
+  }
+
+  if (!asset) return null
+  if (!underlyingAssetsWithBalancesAndIcons) return null
+
+  return (
+    <Overview
+      accountId={maybeAccountId}
+      onAccountIdChange={handleAccountIdChange}
+      positionAddress={positionAddress}
+      asset={asset}
+      name={earnOpportunityData.name ?? ''}
+      opportunityFiatBalance={stakedFiatBalance}
+      underlyingAssetsCryptoPrecision={underlyingAssetsWithBalancesAndIcons}
+      provider={makeDefiProviderDisplayName({
+        provider: earnOpportunityData.provider,
+        assetName: asset.name,
+      })}
+      description={description}
+      tvl={bnOrZero(earnOpportunityData.tvl).toFixed(2)}
+      apy={earnOpportunityData.apy}
+      menu={menu}
+    />
+  )
+}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/ThorchainSaversManager.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/RunePoolManager.tsx
similarity index 58%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/ThorchainSaversManager.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/RunePoolManager.tsx
index e4cd9139046..6a88fa8006a 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/ThorchainSaversManager.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/RunePoolManager.tsx
@@ -2,10 +2,9 @@ import type { AccountId } from '@shapeshiftoss/caip'
 import { AnimatePresence } from 'framer-motion'
 import { useState } from 'react'
 
-import { ThorchainSaversDeposit } from './Deposit/ThorchainSaversDeposit'
-import { Dust } from './Dust/Dust'
-import { ThorchainSaversOverview } from './Overview/ThorchainSaversOverview'
-import { ThorchainSaversWithdraw } from './Withdraw/ThorchainSaversWithdraw'
+import { RunePoolDeposit } from './Deposit/RunePoolDeposit'
+import { RunePoolOverview } from './Overview/RunePoolOverview'
+import { RunePoolWithdraw } from './Withdraw/RunePoolWithdraw'
 
 import { SlideTransition } from '@/components/SlideTransition'
 import type {
@@ -15,7 +14,7 @@ import type {
 import { DefiAction } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
 
-export const ThorchainSaversManager = () => {
+export const RunePoolManager = () => {
   const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
   const { modal } = query
   const [accountId, setAccountId] = useState<AccountId | undefined>()
@@ -24,22 +23,17 @@ export const ThorchainSaversManager = () => {
     <AnimatePresence mode='wait' initial={false}>
       {modal === DefiAction.Overview && (
         <SlideTransition key={DefiAction.Overview}>
-          <ThorchainSaversOverview accountId={accountId} onAccountIdChange={setAccountId} />
+          <RunePoolOverview accountId={accountId} onAccountIdChange={setAccountId} />
         </SlideTransition>
       )}
       {modal === DefiAction.Deposit && (
         <SlideTransition key={DefiAction.Deposit}>
-          <ThorchainSaversDeposit accountId={accountId} onAccountIdChange={setAccountId} />
+          <RunePoolDeposit accountId={accountId} onAccountIdChange={setAccountId} />
         </SlideTransition>
       )}
       {modal === DefiAction.Withdraw && (
         <SlideTransition key={DefiAction.Withdraw}>
-          <ThorchainSaversWithdraw accountId={accountId} onAccountIdChange={setAccountId} />
-        </SlideTransition>
-      )}
-      {modal === DefiAction.SendDust && (
-        <SlideTransition key={DefiAction.SendDust}>
-          <Dust accountId={accountId} onAccountIdChange={setAccountId} />
+          <RunePoolWithdraw accountId={accountId} onAccountIdChange={setAccountId} />
         </SlideTransition>
       )}
     </AnimatePresence>
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/ThorchainSaversWithdraw.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/RunePoolWithdraw.tsx
similarity index 66%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/ThorchainSaversWithdraw.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/RunePoolWithdraw.tsx
index fb3d416ca63..c2409419653 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/ThorchainSaversWithdraw.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/RunePoolWithdraw.tsx
@@ -1,8 +1,6 @@
 import { Center } from '@chakra-ui/react'
 import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { isUtxoChainId } from '@shapeshiftoss/utils'
-import { skipToken, useQuery } from '@tanstack/react-query'
+import { fromAccountId, toAssetId } from '@shapeshiftoss/caip'
 import qs from 'qs'
 import { useCallback, useEffect, useMemo, useReducer } from 'react'
 import { useTranslate } from 'react-polyglot'
@@ -11,15 +9,14 @@ import { useNavigate } from 'react-router-dom'
 import { Confirm } from './components/Confirm'
 import { Status } from './components/Status'
 import { Withdraw } from './components/Withdraw'
-import { ThorchainSaversWithdrawActionType } from './WithdrawCommon'
+import { RunePoolWithdrawActionType } from './WithdrawCommon'
 import { WithdrawContext } from './WithdrawContext'
 import { initialState, reducer } from './WithdrawReducer'
 
 import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
 import { CircularProgress } from '@/components/CircularProgress/CircularProgress'
-import type { DefiStepProps, StepComponentProps } from '@/components/DeFi/components/Steps'
+import type { DefiStepProps } from '@/components/DeFi/components/Steps'
 import { Steps } from '@/components/DeFi/components/Steps'
-import { Sweep } from '@/components/Sweep'
 import { DefiModalContent } from '@/features/defi/components/DefiModal/DefiModalContent'
 import { DefiModalHeader } from '@/features/defi/components/DefiModal/DefiModalHeader'
 import type {
@@ -29,15 +26,12 @@ import type {
 import { DefiAction, DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
 import { useWallet } from '@/hooks/useWallet/useWallet'
-import { getThorchainFromAddress } from '@/lib/utils/thorchain'
-import { getThorchainSaversPosition } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
 import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
 import {
   selectAssetById,
   selectEarnUserStakingOpportunityByUserStakingId,
   selectHighestStakingBalanceAccountIdByStakingId,
   selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioAccountMetadataByAccountId,
 } from '@/state/slices/selectors'
 import { useAppSelector } from '@/state/store'
 
@@ -46,7 +40,7 @@ type WithdrawProps = {
   onAccountIdChange: AccountDropdownProps['onChange']
 }
 
-export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId }) => {
+export const RunePoolWithdraw: React.FC<WithdrawProps> = ({ accountId }) => {
   const [state, dispatch] = useReducer(reducer, initialState)
   const translate = useTranslate()
   const { query, location } = useBrowserRouter<DefiQueryParams, DefiParams>()
@@ -59,8 +53,6 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
     assetReference,
   })
 
-  const isRunePool = assetId === thorchainAssetId
-
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
 
@@ -99,36 +91,20 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
       : undefined,
   )
 
-  // user info
   const {
     state: { wallet },
   } = useWallet()
 
-  const accountFilter = useMemo(() => ({ accountId }), [accountId])
-  const accountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, accountFilter),
+  // RUNE is not a UTXO asset - the account address *is* the from address
+  const fromAddress = useMemo(
+    () => (accountId ? fromAccountId(accountId).account : undefined),
+    [accountId],
   )
 
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', accountId, assetId, opportunityId],
-    queryFn:
-      accountId && wallet && accountMetadata
-        ? () =>
-            getThorchainFromAddress({
-              accountId,
-              assetId,
-              opportunityId,
-              getPosition: getThorchainSaversPosition,
-              accountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
   useEffect(() => {
     if (state.opportunity) return
     if (!(wallet && opportunityData)) return
-    dispatch({ type: ThorchainSaversWithdrawActionType.SET_OPPORTUNITY, payload: opportunityData })
+    dispatch({ type: RunePoolWithdrawActionType.SET_OPPORTUNITY, payload: opportunityData })
   }, [opportunityData, state.opportunity, wallet])
 
   const handleBack = useCallback(() => {
@@ -141,15 +117,6 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
     })
   }, [navigate, location, query])
 
-  const makeHandleSweepBack = useCallback(
-    (onNext: StepComponentProps['onNext']) => () => onNext(DefiStep.Info),
-    [],
-  )
-  const makeHandleSweepSeen = useCallback(
-    (onNext: StepComponentProps['onNext']) => () => onNext(DefiStep.Confirm),
-    [],
-  )
-
   const StepConfig: DefiStepProps = useMemo(() => {
     return {
       [DefiStep.Info]: {
@@ -161,22 +128,6 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
           <Withdraw {...ownProps} accountId={accountId} fromAddress={fromAddress} />
         ),
       },
-      ...(isUtxoChainId(chainId)
-        ? {
-            [DefiStep.Sweep]: {
-              label: translate('modals.send.consolidate.consolidateFunds'),
-              component: ({ onNext }) => (
-                <Sweep
-                  accountId={accountId}
-                  fromAddress={fromAddress ?? null}
-                  assetId={assetId}
-                  onBack={makeHandleSweepBack(onNext)}
-                  onSweepSeen={makeHandleSweepSeen(onNext)}
-                />
-              ),
-            },
-          }
-        : {}),
       [DefiStep.Confirm]: {
         label: translate('defi.steps.confirm.title'),
         component: ownProps => <Confirm {...ownProps} accountId={accountId} />,
@@ -187,16 +138,7 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
       },
     }
     // We only need this to update on symbol change
-  }, [
-    accountId,
-    asset.symbol,
-    assetId,
-    chainId,
-    fromAddress,
-    makeHandleSweepBack,
-    makeHandleSweepSeen,
-    translate,
-  ])
+  }, [accountId, asset.symbol, fromAddress, translate])
 
   const value = useMemo(() => ({ state, dispatch }), [state])
 
@@ -211,9 +153,7 @@ export const ThorchainSaversWithdraw: React.FC<WithdrawProps> = ({ accountId })
     <WithdrawContext.Provider value={value}>
       <DefiModalContent>
         <DefiModalHeader
-          title={translate('modals.withdraw.withdrawFrom', {
-            opportunity: isRunePool ? 'RUNEPool' : `${asset.symbol} Vault`,
-          })}
+          title={translate('modals.withdraw.withdrawFrom', { opportunity: 'RUNEPool' })}
           onBack={handleBack}
         />
         <Steps steps={StepConfig} />
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawCommon.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawCommon.ts
new file mode 100644
index 00000000000..df2409af619
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawCommon.ts
@@ -0,0 +1,44 @@
+import type { WithdrawValues } from '@/features/defi/components/Withdraw/Withdraw'
+import type { StakingEarnOpportunityType } from '@/state/slices/opportunitiesSlice/types'
+
+type RunePoolWithdrawValues = WithdrawValues & {
+  txStatus: string
+  estimatedGasCryptoBaseUnit?: string
+  networkFeeCryptoBaseUnit: string
+}
+
+export type RunePoolWithdrawState = {
+  opportunity: StakingEarnOpportunityType | null
+  withdraw: RunePoolWithdrawValues
+  loading: boolean
+  txid: string | null
+}
+
+export enum RunePoolWithdrawActionType {
+  SET_OPPORTUNITY = 'SET_OPPORTUNITY',
+  SET_WITHDRAW = 'SET_WITHDRAW',
+  SET_LOADING = 'SET_LOADING',
+  SET_TXID = 'SET_TXID',
+}
+
+type SetOpportunityAction = {
+  type: RunePoolWithdrawActionType.SET_OPPORTUNITY
+  payload: StakingEarnOpportunityType
+}
+
+type SetWithdraw = {
+  type: RunePoolWithdrawActionType.SET_WITHDRAW
+  payload: Partial<RunePoolWithdrawValues>
+}
+
+type SetLoading = {
+  type: RunePoolWithdrawActionType.SET_LOADING
+  payload: boolean
+}
+
+type SetTxid = {
+  type: RunePoolWithdrawActionType.SET_TXID
+  payload: string
+}
+
+export type RunePoolWithdrawActions = SetOpportunityAction | SetWithdraw | SetLoading | SetTxid
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawContext.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawContext.ts
new file mode 100644
index 00000000000..7affb9382f2
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawContext.ts
@@ -0,0 +1,10 @@
+import { createContext } from 'react'
+
+import type { RunePoolWithdrawActions, RunePoolWithdrawState } from './WithdrawCommon'
+
+interface IWithdrawContext {
+  state: RunePoolWithdrawState | null
+  dispatch: React.Dispatch<RunePoolWithdrawActions> | null
+}
+
+export const WithdrawContext = createContext<IWithdrawContext>({ state: null, dispatch: null })
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawReducer.ts b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawReducer.ts
new file mode 100644
index 00000000000..9b11f5b2dd3
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/WithdrawReducer.ts
@@ -0,0 +1,33 @@
+import type { RunePoolWithdrawActions, RunePoolWithdrawState } from './WithdrawCommon'
+import { RunePoolWithdrawActionType } from './WithdrawCommon'
+
+export const initialState: RunePoolWithdrawState = {
+  txid: null,
+  opportunity: null,
+  loading: false,
+  withdraw: {
+    fiatAmount: '',
+    cryptoAmount: '',
+    slippage: '',
+    txStatus: 'pending',
+    networkFeeCryptoBaseUnit: '',
+  },
+}
+
+export const reducer = (
+  state: RunePoolWithdrawState,
+  action: RunePoolWithdrawActions,
+): RunePoolWithdrawState => {
+  switch (action.type) {
+    case RunePoolWithdrawActionType.SET_OPPORTUNITY:
+      return { ...state, opportunity: { ...state.opportunity, ...action.payload } }
+    case RunePoolWithdrawActionType.SET_WITHDRAW:
+      return { ...state, withdraw: { ...state.withdraw, ...action.payload } }
+    case RunePoolWithdrawActionType.SET_LOADING:
+      return { ...state, loading: action.payload }
+    case RunePoolWithdrawActionType.SET_TXID:
+      return { ...state, txid: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Confirm.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Confirm.tsx
new file mode 100644
index 00000000000..56eefd58abe
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Confirm.tsx
@@ -0,0 +1,338 @@
+import { Alert, AlertIcon, Box, Skeleton, Stack, useToast } from '@chakra-ui/react'
+import type { AccountId } from '@shapeshiftoss/caip'
+import { fromAccountId, toAssetId } from '@shapeshiftoss/caip'
+import { SwapperName } from '@shapeshiftoss/swapper'
+import { BigAmount } from '@shapeshiftoss/utils'
+import { useCallback, useContext, useEffect, useMemo } from 'react'
+import { useTranslate } from 'react-polyglot'
+
+import { RunePoolWithdrawActionType } from '../WithdrawCommon'
+import { WithdrawContext } from '../WithdrawContext'
+
+import { Amount } from '@/components/Amount/Amount'
+import { AssetIcon } from '@/components/AssetIcon'
+import type { StepComponentProps } from '@/components/DeFi/components/Steps'
+import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
+import { Row } from '@/components/Row/Row'
+import { RawText, Text } from '@/components/Text'
+import type { TextPropTypes } from '@/components/Text/Text'
+import { Confirm as ReusableConfirm } from '@/features/defi/components/Confirm/Confirm'
+import { Summary } from '@/features/defi/components/Summary'
+import type {
+  DefiParams,
+  DefiQueryParams,
+} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
+import { useWallet } from '@/hooks/useWallet/useWallet'
+import { BigNumber, bn, bnOrZero } from '@/lib/bignumber/bignumber'
+import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
+import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
+import { MixPanelEvent } from '@/lib/mixpanel/types'
+import { getWithdrawBps } from '@/lib/utils/thorchain'
+import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
+import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
+import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
+import {
+  selectAssetById,
+  selectAssets,
+  selectEarnUserStakingOpportunityByUserStakingId,
+  selectFeeAssetById,
+  selectHighestStakingBalanceAccountIdByStakingId,
+  selectMarketDataByAssetIdUserCurrency,
+  selectPortfolioCryptoBalanceByFilter,
+} from '@/state/slices/selectors'
+import { useAppSelector } from '@/state/store'
+
+type ConfirmProps = { accountId: AccountId | undefined } & StepComponentProps
+
+export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
+  const { state, dispatch: contextDispatch } = useContext(WithdrawContext)
+  const translate = useTranslate()
+  const mixpanel = getMixPanel()
+  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
+  const { chainId, assetNamespace, assetReference } = query
+  const opportunity = state?.opportunity
+  const assets = useAppSelector(selectAssets)
+
+  const assetId = toAssetId({
+    chainId,
+    assetNamespace,
+    assetReference,
+  })
+
+  const opportunityId = useMemo(
+    () => toOpportunityId({ chainId, assetNamespace, assetReference }),
+    [assetNamespace, assetReference, chainId],
+  )
+  const highestBalanceAccountIdFilter = useMemo(
+    () => ({ stakingId: opportunityId }),
+    [opportunityId],
+  )
+
+  const highestBalanceAccountId = useAppSelector(state =>
+    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
+  )
+  const opportunityDataFilter = useMemo(() => {
+    const _accountId = accountId ?? highestBalanceAccountId
+    if (!_accountId) return
+
+    return {
+      userStakingId: serializeUserStakingId(
+        _accountId,
+        toOpportunityId({
+          chainId,
+          assetNamespace,
+          assetReference,
+        }),
+      ),
+    }
+  }, [accountId, assetNamespace, assetReference, chainId, highestBalanceAccountId])
+
+  const opportunityData = useAppSelector(state =>
+    opportunityDataFilter
+      ? selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter)
+      : undefined,
+  )
+
+  const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))
+  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
+  const feeMarketData = useAppSelector(state =>
+    selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
+  )
+
+  const userAddress = useMemo(
+    () => (accountId ? fromAccountId(accountId).account : ''),
+    [accountId],
+  )
+
+  if (!asset) throw new Error(`Asset not found for AssetId ${opportunityData?.assetId}`)
+  if (!feeAsset) throw new Error(`Fee asset not found for AssetId ${assetId}`)
+
+  const {
+    state: { wallet },
+  } = useWallet()
+
+  const feeAssetBalanceFilter = useMemo(
+    () => ({ assetId: feeAsset?.assetId, accountId }),
+    [accountId, feeAsset?.assetId],
+  )
+  const feeAssetBalance = useAppSelector(s =>
+    selectPortfolioCryptoBalanceByFilter(s, feeAssetBalanceFilter),
+  )
+
+  const toast = useToast()
+
+  const memo = useMemo(() => {
+    if (!state || !opportunityData?.stakedAmountCryptoBaseUnit) return null
+
+    const amountCryptoBaseUnit = BigAmount.fromPrecision({
+      value: state?.withdraw.cryptoAmount,
+      precision: asset.precision,
+    }).toBaseUnit()
+    const withdrawBps = getWithdrawBps({
+      withdrawAmountCryptoBaseUnit: amountCryptoBaseUnit,
+      stakedAmountCryptoBaseUnit: opportunityData.stakedAmountCryptoBaseUnit,
+      rewardsAmountCryptoBaseUnit: opportunityData?.rewardsCryptoBaseUnit?.amounts[0] ?? '0',
+    })
+
+    return `pool-:${withdrawBps}`
+  }, [state, opportunityData, asset.precision])
+
+  const { executeTransaction, estimatedFeesData } = useSendThorTx({
+    accountId: accountId ?? null,
+    assetId,
+    // RUNEPool withdraws are dictated by the memo, not the amount
+    amountCryptoBaseUnit: null,
+    action: 'withdrawRunepool',
+    memo,
+    fromAddress: userAddress || null,
+  })
+
+  const estimatedGasCryptoPrecision = useMemo(() => {
+    if (!estimatedFeesData) return
+    return BigAmount.fromBaseUnit({
+      value: estimatedFeesData.txFeeCryptoBaseUnit,
+      precision: feeAsset.precision,
+    }).toPrecision()
+  }, [estimatedFeesData, feeAsset.precision])
+
+  useEffect(() => {
+    if (!estimatedFeesData || !contextDispatch) return
+
+    contextDispatch({
+      type: RunePoolWithdrawActionType.SET_WITHDRAW,
+      payload: {
+        estimatedGasCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+        networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+      },
+    })
+  }, [contextDispatch, estimatedFeesData])
+
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
+    swapperName: SwapperName.Thorchain,
+  })
+
+  const handleConfirm = useCallback(async () => {
+    if (!contextDispatch || !accountId || !assetId || !opportunityData) return
+    try {
+      if (!(userAddress && wallet && opportunity)) return
+
+      contextDispatch({ type: RunePoolWithdrawActionType.SET_LOADING, payload: true })
+      if (!state?.withdraw.cryptoAmount) return
+
+      // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
+      if (isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
+
+      // Refetch the trading active state JIT to ensure the pool didn't just become halted
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
+
+      const _txId = await executeTransaction()
+      if (!_txId) throw new Error('No txId returned from onSignTx')
+
+      contextDispatch({ type: RunePoolWithdrawActionType.SET_TXID, payload: _txId })
+      onNext(DefiStep.Status)
+      trackOpportunityEvent(
+        MixPanelEvent.WithdrawConfirm,
+        {
+          opportunity: opportunityData,
+          fiatAmounts: [state.withdraw.fiatAmount],
+          cryptoAmounts: [{ assetId, amountCryptoPrecision: state.withdraw.cryptoAmount }],
+        },
+        assets,
+      )
+    } catch (error) {
+      console.error(error)
+      toast({
+        position: 'top-right',
+        description: translate('common.transactionFailedBody'),
+        title: translate('common.transactionFailed'),
+        status: 'error',
+      })
+    } finally {
+      contextDispatch({ type: RunePoolWithdrawActionType.SET_LOADING, payload: false })
+    }
+  }, [
+    contextDispatch,
+    accountId,
+    assetId,
+    opportunityData,
+    userAddress,
+    wallet,
+    opportunity,
+    state?.withdraw.cryptoAmount,
+    state?.withdraw.fiatAmount,
+    isTradingActive,
+    refetchIsTradingActive,
+    executeTransaction,
+    onNext,
+    assets,
+    toast,
+    translate,
+  ])
+
+  const handleCancel = useCallback(() => {
+    onNext(DefiStep.Info)
+  }, [onNext])
+
+  const missingBalanceForGasCryptoPrecision = useMemo(() => {
+    return feeAssetBalance
+      .minus(
+        BigAmount.fromBaseUnit({
+          value: bnOrZero(state?.withdraw.estimatedGasCryptoBaseUnit).toFixed(),
+          precision: feeAsset.precision,
+        }),
+      )
+      .negated()
+      .toPrecision()
+  }, [state?.withdraw.estimatedGasCryptoBaseUnit, feeAssetBalance, feeAsset.precision])
+
+  const hasEnoughBalanceForGas = useMemo(
+    () => bn(missingBalanceForGasCryptoPrecision).lte(0),
+    [missingBalanceForGasCryptoPrecision],
+  )
+
+  useEffect(() => {
+    if (!hasEnoughBalanceForGas) {
+      mixpanel?.track(MixPanelEvent.InsufficientFunds)
+    }
+  }, [hasEnoughBalanceForGas, mixpanel])
+
+  const missingFundsForGasTranslation: TextPropTypes['translation'] = useMemo(
+    () => [
+      'modals.confirm.missingFundsForGas',
+      {
+        cryptoAmountHuman: bn(missingBalanceForGasCryptoPrecision).toFixed(6, BigNumber.ROUND_UP),
+        assetSymbol: feeAsset.symbol,
+      },
+    ],
+    [missingBalanceForGasCryptoPrecision, feeAsset.symbol],
+  )
+
+  if (!state || !contextDispatch) return null
+
+  return (
+    <ReusableConfirm
+      onCancel={handleCancel}
+      headerText='modals.confirm.withdraw.header'
+      isDisabled={!hasEnoughBalanceForGas || !userAddress || isTradingActive === false}
+      loading={state.loading || !userAddress}
+      loadingText={translate('common.confirm')}
+      onConfirm={handleConfirm}
+    >
+      <Summary>
+        <Row variant='vertical' p={4}>
+          <Row.Label>
+            <Text translation='modals.confirm.amountToWithdraw' />
+          </Row.Label>
+          <Row px={0} fontWeight='medium'>
+            <Stack direction='row' alignItems='center'>
+              <AssetIcon size='xs' src={asset.icon} />
+              <RawText>{asset.name}</RawText>
+            </Stack>
+            <Row.Value>
+              <Amount.Crypto value={state.withdraw.cryptoAmount} symbol={asset.symbol} />
+            </Row.Value>
+          </Row>
+        </Row>
+        <Row variant='gutter'>
+          <Row.Label>
+            <HelperTooltip label={translate('trade.tooltip.minerFee')}>
+              <Text translation='trade.minerFee' />
+            </HelperTooltip>
+          </Row.Label>
+          <Row.Value>
+            <Box textAlign='right'>
+              <Skeleton isLoaded={!!estimatedFeesData}>
+                <Amount.Fiat
+                  fontWeight='bold'
+                  value={bnOrZero(estimatedGasCryptoPrecision)
+                    .times(bnOrZero(feeMarketData?.price))
+                    .toFixed()}
+                />
+                <Amount.Crypto
+                  color='text.subtle'
+                  value={estimatedGasCryptoPrecision ?? '0'}
+                  symbol={feeAsset.symbol}
+                />
+              </Skeleton>
+            </Box>
+          </Row.Value>
+        </Row>
+        {!hasEnoughBalanceForGas && (
+          <Alert status='error' borderRadius='lg'>
+            <AlertIcon />
+            <Text translation={missingFundsForGasTranslation} />
+          </Alert>
+        )}
+      </Summary>
+    </ReusableConfirm>
+  )
+}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Status.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Status.tsx
similarity index 70%
rename from src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Status.tsx
rename to src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Status.tsx
index 9ece77dc099..7b7fe612019 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Status.tsx
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Status.tsx
@@ -1,14 +1,13 @@
 import { CheckIcon, CloseIcon, ExternalLinkIcon } from '@chakra-ui/icons'
 import { Box, Button, Link, Stack } from '@chakra-ui/react'
 import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId } from '@shapeshiftoss/caip'
 import { TxStatus as TxStatusType } from '@shapeshiftoss/unchained-client'
 import { BigAmount } from '@shapeshiftoss/utils'
 import { useCallback, useContext, useEffect } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { useNavigate } from 'react-router-dom'
 
-import { ThorchainSaversWithdrawActionType } from '../WithdrawCommon'
+import { RunePoolWithdrawActionType } from '../WithdrawCommon'
 import { WithdrawContext } from '../WithdrawContext'
 
 import { Amount } from '@/components/Amount/Amount'
@@ -21,7 +20,6 @@ import { Summary } from '@/features/defi/components/Summary'
 import { TxStatus } from '@/features/defi/components/TxStatus/TxStatus'
 import { bnOrZero } from '@/lib/bignumber/bignumber'
 import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
 import { MixPanelEvent } from '@/lib/mixpanel/types'
 import { waitForThorchainUpdate } from '@/lib/utils/thorchain'
 import { opportunitiesApi } from '@/state/slices/opportunitiesSlice/opportunitiesApiSlice'
@@ -42,7 +40,6 @@ const externalLinkIcon = <ExternalLinkIcon />
 
 export const Status: React.FC<StatusProps> = ({ accountId }) => {
   const translate = useTranslate()
-  const mixpanel = getMixPanel()
   const { state, dispatch: contextDispatch } = useContext(WithdrawContext)
   const opportunity = state?.opportunity
   const navigate = useNavigate()
@@ -52,8 +49,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
 
   const assetId = state?.opportunity?.assetId
 
-  const isRunePool = assetId === thorchainAssetId
-
   const assets = useAppSelector(selectAssets)
   const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))
   const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId ?? ''))
@@ -64,21 +59,16 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   const feeMarketData = useAppSelector(state =>
     selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
   )
-  const marketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId ?? ''),
-  )
 
   useEffect(() => {
     if (!(contextDispatch && state?.txid?.length && accountId)) return
     ;(async () => {
       if (!state.txid) return
 
-      // Ensuring we wait for the outbound Tx to exist
-      // Note, the transaction we wait for here is a Thorchain transaction, *not* the inbound Tx
       const thorchainTxStatus = await waitForThorchainUpdate({
         txId: state.txid,
         // RUNEPool has no outbound Tx so we skipOutbound, else this will spin to infinity
-        skipOutbound: isRunePool,
+        skipOutbound: true,
       }).promise
 
       if ([TxStatusType.Confirmed, TxStatusType.Failed].includes(thorchainTxStatus)) {
@@ -88,7 +78,7 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
               [
                 {
                   accountId,
-                  defiProvider: DefiProvider.ThorchainSavers,
+                  defiProvider: DefiProvider.RunePool,
                   defiType: DefiType.Staking,
                 },
               ],
@@ -98,18 +88,20 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
         }
 
         contextDispatch({
-          type: ThorchainSaversWithdrawActionType.SET_WITHDRAW,
+          type: RunePoolWithdrawActionType.SET_WITHDRAW,
           payload: {
             txStatus: thorchainTxStatus === TxStatusType.Confirmed ? 'success' : 'failed',
           },
         })
       }
     })()
-  }, [accountId, appDispatch, contextDispatch, getOpportunitiesUserData, isRunePool, state?.txid])
+  }, [accountId, appDispatch, contextDispatch, getOpportunitiesUserData, state?.txid])
 
   const handleViewPosition = useCallback(() => {
-    navigate('/wallet/earn')
-  }, [navigate])
+    if (!accountId) return
+    // The full-page earn dashboard is mobile-only - the account page shows the position on both layouts
+    navigate(`/accounts/${accountId}`)
+  }, [accountId, navigate])
 
   const handleCancel = useCallback(() => {
     navigate(-1)
@@ -131,7 +123,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   }, [
     assets,
     assetId,
-    mixpanel,
     opportunity,
     state?.withdraw.cryptoAmount,
     state?.withdraw.fiatAmount,
@@ -148,7 +139,7 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
           statusIcon: <CheckIcon color='white' />,
           statusBg: 'green.500',
           statusBody: translate('modals.withdraw.status.success', {
-            opportunity: `${asset.symbol} Vault`,
+            opportunity: 'RUNEPool',
           }),
         }
       case 'failed':
@@ -171,7 +162,9 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
   return (
     <TxStatus
       onClose={handleCancel}
-      onContinue={state.withdraw.txStatus === 'success' ? handleViewPosition : undefined}
+      onContinue={
+        state.withdraw.txStatus === 'success' && accountId ? handleViewPosition : undefined
+      }
       loading={!['success', 'failed'].includes(state.withdraw.txStatus)}
       continueText='modals.status.position'
       statusText={statusText}
@@ -194,36 +187,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
             </Row.Value>
           </Row>
         </Row>
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.protocolFee')}>
-              <Text translation={'trade.protocolFee'} />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Box textAlign='right'>
-              <Amount.Fiat
-                fontWeight='bold'
-                value={bnOrZero(
-                  BigAmount.fromBaseUnit({
-                    value: state.withdraw.protocolFeeCryptoBaseUnit ?? '0',
-                    precision: asset.precision,
-                  }).toPrecision(),
-                )
-                  .times(bnOrZero(marketData?.price))
-                  .toFixed()}
-              />
-              <Amount.Crypto
-                color='text.subtle'
-                value={BigAmount.fromBaseUnit({
-                  value: state.withdraw.protocolFeeCryptoBaseUnit ?? '0',
-                  precision: asset.precision,
-                }).toPrecision()}
-                symbol={asset.symbol}
-              />
-            </Box>
-          </Row.Value>
-        </Row>
         <Row variant='gutter'>
           <Row.Label>
             <HelperTooltip label={translate('trade.tooltip.minerFee')}>
@@ -254,38 +217,6 @@ export const Status: React.FC<StatusProps> = ({ accountId }) => {
             </Box>
           </Row.Value>
         </Row>
-        {!isRunePool ? (
-          <Row variant='gutter'>
-            <Row.Label>
-              <HelperTooltip label={translate('defi.modals.saversVaults.dustAmountTooltip')}>
-                <Text translation='defi.modals.saversVaults.dustAmount' />
-              </HelperTooltip>
-            </Row.Label>
-            <Row.Value>
-              <Box textAlign='right'>
-                <Amount.Fiat
-                  fontWeight='bold'
-                  value={bnOrZero(
-                    BigAmount.fromBaseUnit({
-                      value: state.withdraw.dustAmountCryptoBaseUnit ?? '0',
-                      precision: feeAsset.precision,
-                    }).toPrecision(),
-                  )
-                    .times(bnOrZero(feeMarketData?.price))
-                    .toFixed()}
-                />
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={BigAmount.fromBaseUnit({
-                    value: state.withdraw.dustAmountCryptoBaseUnit ?? '0',
-                    precision: feeAsset.precision,
-                  }).toPrecision()}
-                  symbol={feeAsset.symbol}
-                />
-              </Box>
-            </Row.Value>
-          </Row>
-        ) : null}
         <Row variant='gutter'>
           <Button
             as={Link}
diff --git a/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Withdraw.tsx
new file mode 100644
index 00000000000..600da9c8397
--- /dev/null
+++ b/src/features/defi/providers/runepool/components/RunePoolManager/Withdraw/components/Withdraw.tsx
@@ -0,0 +1,312 @@
+import type { AccountId } from '@shapeshiftoss/caip'
+import { toAssetId } from '@shapeshiftoss/caip'
+import type { Asset } from '@shapeshiftoss/types'
+import { BigAmount, convertPercentageToBasisPoints } from '@shapeshiftoss/utils'
+import { useCallback, useContext, useMemo } from 'react'
+import { FormProvider, useForm, useWatch } from 'react-hook-form'
+import { useTranslate } from 'react-polyglot'
+import { useNavigate } from 'react-router-dom'
+
+import { RunePoolWithdrawActionType } from '../WithdrawCommon'
+import { WithdrawContext } from '../WithdrawContext'
+
+import type { StepComponentProps } from '@/components/DeFi/components/Steps'
+import type { WithdrawValues } from '@/features/defi/components/Withdraw/Withdraw'
+import { Field, Withdraw as ReusableWithdraw } from '@/features/defi/components/Withdraw/Withdraw'
+import type {
+  DefiParams,
+  DefiQueryParams,
+} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
+import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
+import { useNotificationToast } from '@/hooks/useNotificationToast'
+import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
+import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
+import { MixPanelEvent } from '@/lib/mixpanel/types'
+import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
+import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
+import {
+  selectAssetById,
+  selectAssets,
+  selectEarnUserStakingOpportunityByUserStakingId,
+  selectHighestStakingBalanceAccountIdByStakingId,
+  selectMarketDataByAssetIdUserCurrency,
+} from '@/state/slices/selectors'
+import { useAppSelector } from '@/state/store'
+
+type WithdrawProps = StepComponentProps & {
+  accountId: AccountId | undefined
+  fromAddress: string | undefined
+}
+
+const percentOptions = [0.25, 0.5, 0.75, 1]
+
+export const Withdraw: React.FC<WithdrawProps> = ({ accountId, fromAddress, onNext }) => {
+  const { state, dispatch } = useContext(WithdrawContext)
+  const translate = useTranslate()
+  const toast = useNotificationToast({ desktopPosition: 'top-right' })
+  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
+  const { chainId, assetNamespace, assetReference } = query
+  const navigate = useNavigate()
+
+  const methods = useForm<WithdrawValues>({ mode: 'onChange' })
+  const { control, setValue } = methods
+
+  const cryptoAmount = useWatch<WithdrawValues, Field.CryptoAmount>({
+    control,
+    name: Field.CryptoAmount,
+  })
+
+  const assets = useAppSelector(selectAssets)
+  const assetId = toAssetId({ chainId, assetNamespace, assetReference })
+
+  const opportunityId = useMemo(
+    () => (assetId ? toOpportunityId({ chainId, assetNamespace, assetReference }) : undefined),
+    [assetId, assetNamespace, assetReference, chainId],
+  )
+
+  const highestBalanceAccountIdFilter = useMemo(
+    () => ({ stakingId: opportunityId }),
+    [opportunityId],
+  )
+  const highestBalanceAccountId = useAppSelector(state =>
+    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
+  )
+
+  const opportunityDataFilter = useMemo(
+    () => ({
+      userStakingId: serializeUserStakingId(
+        accountId ?? highestBalanceAccountId ?? '',
+        opportunityId ?? '',
+      ),
+    }),
+    [accountId, highestBalanceAccountId, opportunityId],
+  )
+
+  const opportunityData = useAppSelector(state =>
+    selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter),
+  )
+
+  const asset: Asset | undefined = useAppSelector(state => selectAssetById(state, assetId))
+  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
+
+  const amountAvailableCryptoPrecision = useMemo(() => {
+    const totalBaseUnit = bnOrZero(opportunityData?.stakedAmountCryptoBaseUnit)
+      .plus(bnOrZero(opportunityData?.rewardsCryptoBaseUnit?.amounts[0])) // RUNEPool rewards are denominated in RUNE
+      .toFixed(0)
+    return BigAmount.fromBaseUnit({
+      value: totalBaseUnit,
+      precision: asset.precision,
+    })
+  }, [
+    asset.precision,
+    opportunityData?.rewardsCryptoBaseUnit,
+    opportunityData?.stakedAmountCryptoBaseUnit,
+  ])
+
+  const assetMarketData = useAppSelector(state =>
+    selectMarketDataByAssetIdUserCurrency(state, assetId),
+  )
+
+  const fiatAmountAvailable = useMemo(
+    () => amountAvailableCryptoPrecision.times(assetMarketData?.price),
+    [amountAvailableCryptoPrecision, assetMarketData?.price],
+  )
+
+  const hasEnoughStakingBalance = useMemo(
+    () => amountAvailableCryptoPrecision.gte(cryptoAmount),
+    [amountAvailableCryptoPrecision, cryptoAmount],
+  )
+
+  const memo = useMemo(() => {
+    if (!hasEnoughStakingBalance) return null
+
+    const percent = bnOrZero(cryptoAmount)
+      .div(amountAvailableCryptoPrecision.toPrecision())
+      .times(100)
+      .toFixed(0)
+    const basisPoints = convertPercentageToBasisPoints(percent)
+
+    return `pool-:${basisPoints}`
+  }, [amountAvailableCryptoPrecision, cryptoAmount, hasEnoughStakingBalance])
+
+  const { estimatedFeesData, isEstimatedFeesDataLoading, outboundFeeCryptoBaseUnit } =
+    useSendThorTx({
+      assetId,
+      accountId: accountId ?? '',
+      // RUNEPool withdraws are dictated by the memo, not the amount
+      amountCryptoBaseUnit: null,
+      memo,
+      fromAddress: fromAddress ?? null,
+      action: 'withdrawRunepool',
+    })
+
+  const handleContinue = useCallback(
+    (formValues: WithdrawValues) => {
+      if (!dispatch || !estimatedFeesData || !opportunityData) return
+
+      dispatch({ type: RunePoolWithdrawActionType.SET_WITHDRAW, payload: formValues })
+      dispatch({ type: RunePoolWithdrawActionType.SET_LOADING, payload: true })
+
+      try {
+        dispatch({
+          type: RunePoolWithdrawActionType.SET_WITHDRAW,
+          payload: {
+            estimatedGasCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+            networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
+          },
+        })
+
+        onNext(DefiStep.Confirm)
+
+        trackOpportunityEvent(
+          MixPanelEvent.WithdrawContinue,
+          {
+            opportunity: opportunityData,
+            fiatAmounts: [formValues.fiatAmount],
+            cryptoAmounts: [{ assetId, amountCryptoPrecision: formValues.cryptoAmount }],
+          },
+          assets,
+        )
+      } catch (error) {
+        console.error(error)
+        toast({
+          description: translate('common.somethingWentWrongBody'),
+          title: translate('common.somethingWentWrong'),
+          status: 'error',
+        })
+      } finally {
+        dispatch({ type: RunePoolWithdrawActionType.SET_LOADING, payload: false })
+      }
+    },
+    [opportunityData, dispatch, onNext, assetId, assets, estimatedFeesData, toast, translate],
+  )
+
+  const handleCancel = useCallback(() => {
+    navigate(-1)
+  }, [navigate])
+
+  const handlePercentClick = useCallback(
+    (percent: number) => {
+      const cryptoAmount = amountAvailableCryptoPrecision.times(percent)
+      const fiatAmount = cryptoAmount.times(assetMarketData?.price)
+
+      setValue(Field.FiatAmount, fiatAmount.toPrecision(), { shouldValidate: true })
+      setValue(Field.CryptoAmount, cryptoAmount.toFixed(asset.precision), { shouldValidate: true })
+    },
+    [amountAvailableCryptoPrecision, asset.precision, assetMarketData?.price, setValue],
+  )
+
+  // https://gitlab.com/thorchain/thornode/-/blob/develop/x/thorchain/querier_quotes.go#L467
+  const safeOutboundFeeCryptoBaseUnit = useMemo(() => {
+    if (!outboundFeeCryptoBaseUnit) return
+    return bnOrZero(outboundFeeCryptoBaseUnit).times(4).toFixed(0)
+  }, [outboundFeeCryptoBaseUnit])
+
+  const validateCryptoAmount = useCallback(
+    (value: string) => {
+      if (!opportunityData) return false
+      if (!safeOutboundFeeCryptoBaseUnit) return false
+
+      const withdrawAmountCryptoPrecision = bnOrZero(value)
+      const withdrawAmountCryptoBaseUnit = BigAmount.fromPrecision({
+        value,
+        precision: asset.precision,
+      }).toBaseUnit()
+
+      if (amountAvailableCryptoPrecision.lt(withdrawAmountCryptoPrecision))
+        return 'common.insufficientFunds'
+
+      const isBelowWithdrawThreshold = bn(withdrawAmountCryptoBaseUnit)
+        .minus(safeOutboundFeeCryptoBaseUnit)
+        .lt(0)
+
+      if (isBelowWithdrawThreshold) {
+        const minLimitCryptoPrecision = BigAmount.fromBaseUnit({
+          value: safeOutboundFeeCryptoBaseUnit,
+          precision: asset.precision,
+        }).toPrecision()
+        const minLimit = `${minLimitCryptoPrecision} ${asset.symbol}`
+        return translate('trade.errors.amountTooSmall', {
+          minLimit,
+        })
+      }
+
+      if (withdrawAmountCryptoPrecision.isEqualTo(0)) return ''
+
+      return (
+        (amountAvailableCryptoPrecision.gt(0) && withdrawAmountCryptoPrecision.gt(0)) ||
+        'common.insufficientFunds'
+      )
+    },
+    [
+      amountAvailableCryptoPrecision,
+      asset.precision,
+      asset.symbol,
+      opportunityData,
+      safeOutboundFeeCryptoBaseUnit,
+      translate,
+    ],
+  )
+
+  const validateFiatAmount = useCallback(
+    (value: string) => {
+      if (!opportunityData) return false
+
+      const amountAvailableFiat = amountAvailableCryptoPrecision.times(assetMarketData?.price)
+      const valueFiat = bnOrZero(value)
+
+      if (amountAvailableFiat.lt(valueFiat)) return 'common.insufficientFunds'
+      if (valueFiat.isEqualTo(0)) return ''
+
+      return amountAvailableFiat.gt(0) || 'common.insufficientFunds'
+    },
+    [amountAvailableCryptoPrecision, assetMarketData?.price, opportunityData],
+  )
+
+  const cryptoInputValidation = useMemo(
+    () => ({
+      required: true,
+      validate: { validateCryptoAmount },
+    }),
+    [validateCryptoAmount],
+  )
+
+  const fiatInputValidation = useMemo(
+    () => ({
+      required: true,
+      validate: { validateFiatAmount },
+    }),
+    [validateFiatAmount],
+  )
+
+  if (!state) return null
+
+  return (
+    <FormProvider {...methods}>
+      <ReusableWithdraw
+        asset={asset}
+        cryptoAmountAvailable={amountAvailableCryptoPrecision.toPrecision()}
+        cryptoInputValidation={cryptoInputValidation}
+        fiatAmountAvailable={fiatAmountAvailable.toPrecision()}
+        fiatInputValidation={fiatInputValidation}
+        marketData={
+          assetMarketData ?? {
+            price: '0',
+            marketCap: '0',
+            volume: '0',
+            changePercent24Hr: 0,
+            supply: '0',
+            maxSupply: '0',
+          }
+        }
+        onCancel={handleCancel}
+        onContinue={handleContinue}
+        isLoading={isEstimatedFeesDataLoading || state.loading}
+        percentOptions={percentOptions}
+        enableSlippage={false}
+        handlePercentClick={handlePercentClick}
+      />
+    </FormProvider>
+  )
+}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositCommon.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositCommon.ts
deleted file mode 100644
index e21987ab0b5..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositCommon.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import type { DepositValues } from '@/features/defi/components/Deposit/Deposit'
-import type { StakingEarnOpportunityType } from '@/state/slices/opportunitiesSlice/types'
-
-type EstimatedGas = {
-  estimatedGasCryptoPrecision?: string
-}
-
-type ThorchainSaversDepositValues = DepositValues &
-  EstimatedGas & {
-    txStatus: string
-    networkFeeCryptoBaseUnit: string
-    protocolFeeCryptoBaseUnit: string
-    maybeFromUTXOAccountAddress: string
-    sendMax?: boolean
-  }
-
-export type ThorchainSaversDepositState = {
-  opportunity: StakingEarnOpportunityType | null
-  approve: EstimatedGas
-  isExactAllowance?: boolean
-  deposit: ThorchainSaversDepositValues
-  loading: boolean
-  txid: string | null
-}
-
-export enum ThorchainSaversDepositActionType {
-  SET_OPPORTUNITY = 'SET_OPPORTUNITY',
-  SET_APPROVE = 'SET_APPROVE',
-  SET_IS_EXACT_ALLOWANCE = 'SET_IS_EXACT_ALLOWANCE',
-  SET_DEPOSIT = 'SET_DEPOSIT',
-  SET_LOADING = 'SET_LOADING',
-  SET_TXID = 'SET_TXID',
-}
-
-type SetOpportunityAction = {
-  type: ThorchainSaversDepositActionType.SET_OPPORTUNITY
-  payload: StakingEarnOpportunityType
-}
-
-type SetApprove = {
-  type: ThorchainSaversDepositActionType.SET_APPROVE
-  payload: EstimatedGas
-}
-
-type SetIsExactAllowance = {
-  type: ThorchainSaversDepositActionType.SET_IS_EXACT_ALLOWANCE
-  payload: boolean
-}
-
-type SetDeposit = {
-  type: ThorchainSaversDepositActionType.SET_DEPOSIT
-  payload: Partial<ThorchainSaversDepositValues>
-}
-
-type SetLoading = {
-  type: ThorchainSaversDepositActionType.SET_LOADING
-  payload: boolean
-}
-
-type SetTxid = {
-  type: ThorchainSaversDepositActionType.SET_TXID
-  payload: string
-}
-
-export type ThorchainSaversDepositActions =
-  | SetOpportunityAction
-  | SetApprove
-  | SetDeposit
-  | SetLoading
-  | SetTxid
-  | SetIsExactAllowance
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositContext.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositContext.ts
deleted file mode 100644
index 9ce50f87b01..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositContext.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createContext } from 'react'
-
-import type { ThorchainSaversDepositActions, ThorchainSaversDepositState } from './DepositCommon'
-
-interface IDepositContext {
-  state: ThorchainSaversDepositState | null
-  dispatch: React.Dispatch<ThorchainSaversDepositActions> | null
-}
-
-export const DepositContext = createContext<IDepositContext>({ state: null, dispatch: null })
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositReducer.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositReducer.ts
deleted file mode 100644
index 78a6c3f2ae5..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/DepositReducer.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { ThorchainSaversDepositActions, ThorchainSaversDepositState } from './DepositCommon'
-import { ThorchainSaversDepositActionType } from './DepositCommon'
-
-export const initialState: ThorchainSaversDepositState = {
-  txid: null,
-  opportunity: null,
-  loading: false,
-  isExactAllowance: false,
-  approve: {},
-  deposit: {
-    fiatAmount: '',
-    cryptoAmount: '',
-    slippage: '',
-    txStatus: 'pending',
-    protocolFeeCryptoBaseUnit: '',
-    networkFeeCryptoBaseUnit: '',
-    maybeFromUTXOAccountAddress: '',
-  },
-}
-
-export const reducer = (
-  state: ThorchainSaversDepositState,
-  action: ThorchainSaversDepositActions,
-): ThorchainSaversDepositState => {
-  switch (action.type) {
-    case ThorchainSaversDepositActionType.SET_OPPORTUNITY:
-      return { ...state, opportunity: { ...state.opportunity, ...action.payload } }
-    case ThorchainSaversDepositActionType.SET_APPROVE:
-      return { ...state, approve: action.payload }
-    case ThorchainSaversDepositActionType.SET_DEPOSIT:
-      return { ...state, deposit: { ...state.deposit, ...action.payload } }
-    case ThorchainSaversDepositActionType.SET_LOADING:
-      return { ...state, loading: action.payload }
-    case ThorchainSaversDepositActionType.SET_IS_EXACT_ALLOWANCE:
-      return { ...state, isExactAllowance: action.payload }
-    case ThorchainSaversDepositActionType.SET_TXID:
-      return { ...state, txid: action.payload }
-    default:
-      return state
-  }
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Approve.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Approve.tsx
deleted file mode 100644
index b7d38278766..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Approve.tsx
+++ /dev/null
@@ -1,298 +0,0 @@
-import type { AccountId } from '@shapeshiftoss/caip'
-import { fromAccountId, fromAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { CONTRACT_INTERACTION } from '@shapeshiftoss/chain-adapters'
-import { ContractType, getOrCreateContractByType } from '@shapeshiftoss/contracts'
-import { isTrezor } from '@shapeshiftoss/hdwallet-trezor'
-import { assetIdToThorPoolAssetId } from '@shapeshiftoss/swapper'
-import { BigAmount, isToken } from '@shapeshiftoss/utils'
-import { useCallback, useContext, useMemo } from 'react'
-import { useNavigate } from 'react-router-dom'
-import { encodeFunctionData, getAddress, maxUint256 } from 'viem'
-
-import { ThorchainSaversDepositActionType } from '../DepositCommon'
-import { DepositContext } from '../DepositContext'
-
-import type { StepComponentProps } from '@/components/DeFi/components/Steps'
-import { Approve as ReusableApprove } from '@/features/defi/components/Approve/Approve'
-import { ApprovePreFooter } from '@/features/defi/components/Approve/ApprovePreFooter'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiAction, DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { canCoverTxFees } from '@/features/defi/helpers/utils'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useErrorToast } from '@/hooks/useErrorToast/useErrorToast'
-import { usePoll } from '@/hooks/usePoll/usePoll'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { isSome } from '@/lib/utils'
-import {
-  assertGetEvmChainAdapter,
-  buildAndBroadcast,
-  createBuildCustomTxInput,
-  getErc20Allowance,
-} from '@/lib/utils/evm'
-import { useGetThorchainSaversDepositQuoteQuery } from '@/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import { DefiProvider } from '@/state/slices/opportunitiesSlice/types'
-import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
-import {
-  selectAccountNumberByAccountId,
-  selectAssetById,
-  selectAssets,
-  selectEarnUserStakingOpportunityByUserStakingId,
-  selectFeeAssetById,
-  selectMarketDataByAssetIdUserCurrency,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type ApproveProps = StepComponentProps & { accountId: AccountId | undefined; isReset?: boolean }
-
-export const Approve: React.FC<ApproveProps> = ({ accountId, onNext, isReset }) => {
-  const { poll } = usePoll()
-  const { state, dispatch } = useContext(DepositContext)
-  const estimatedGasCryptoPrecision = state?.approve.estimatedGasCryptoPrecision
-  const navigate = useNavigate()
-  const { showErrorToast } = useErrorToast()
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const accountNumberFilter = useMemo(() => ({ accountId }), [accountId])
-  const accountNumber = useAppSelector(state =>
-    selectAccountNumberByAccountId(state, accountNumberFilter),
-  )
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const { chainId, assetNamespace, assetReference } = query
-
-  const assetId = toAssetId({
-    chainId,
-    assetNamespace,
-    assetReference,
-  })
-  const assets = useAppSelector(selectAssets)
-  const asset = useAppSelector(state => selectAssetById(state, assetId))
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
-
-  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
-  if (!feeAsset) throw new Error(`Fee asset not found for AssetId ${assetId}`)
-
-  const opportunityId = useMemo(
-    () => toOpportunityId({ chainId, assetNamespace, assetReference }),
-    [assetNamespace, assetReference, chainId],
-  )
-
-  const opportunityDataFilter = useMemo(
-    () => ({
-      userStakingId: serializeUserStakingId(accountId ?? '', opportunityId),
-    }),
-    [accountId, opportunityId],
-  )
-
-  const opportunityData = useAppSelector(state =>
-    selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter),
-  )
-
-  const isTokenDeposit = isToken(assetId)
-
-  const feeMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, feeAsset.assetId),
-  )
-
-  const { data: thorchainSaversDepositQuote } = useGetThorchainSaversDepositQuoteQuery({
-    asset,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: state?.deposit.cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit(),
-  })
-
-  const { inboundAddress } = useSendThorTx({
-    assetId,
-    accountId: accountId ?? null,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: state?.deposit.cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit(),
-    memo: thorchainSaversDepositQuote?.memo ?? null,
-    fromAddress: '',
-    action: 'depositSavers',
-    enableEstimateFees: false,
-  })
-
-  const handleApprove = useCallback(async () => {
-    if (
-      !state?.deposit.cryptoAmount ||
-      accountNumber === undefined ||
-      !wallet ||
-      !accountId ||
-      !dispatch ||
-      !opportunityData ||
-      !inboundAddress
-    )
-      return
-
-    dispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-
-    try {
-      const amountCryptoBaseUnitOrZero = isReset
-        ? '0'
-        : BigAmount.fromPrecision({
-            value: state.deposit.cryptoAmount,
-            precision: asset.precision,
-          }).toBaseUnit()
-
-      const poolId = assetIdToThorPoolAssetId({ assetId: asset.assetId })
-
-      if (!poolId) throw new Error(`poolId not found for assetId ${asset.assetId}`)
-
-      const contract = getOrCreateContractByType({
-        address: fromAssetId(assetId).assetReference,
-        type: ContractType.ERC20,
-        chainId,
-      })
-
-      const amountToApprove =
-        state.isExactAllowance || isReset ? amountCryptoBaseUnitOrZero : maxUint256
-
-      const data = encodeFunctionData({
-        abi: contract.abi,
-        functionName: 'approve',
-        args: [getAddress(inboundAddress), BigInt(amountToApprove)],
-      })
-
-      const adapter = assertGetEvmChainAdapter(chainId)
-
-      const buildCustomTxInput = await createBuildCustomTxInput({
-        accountNumber,
-        from: fromAccountId(accountId).account,
-        adapter,
-        data,
-        value: '0',
-        to: fromAssetId(assetId).assetReference,
-        wallet,
-        pubKey: isTrezor(wallet) && accountId ? fromAccountId(accountId).account : undefined,
-      })
-
-      await buildAndBroadcast({
-        adapter,
-        buildCustomTxInput,
-        receiverAddress: CONTRACT_INTERACTION, // no receiver for this contract call
-      })
-      await poll({
-        fn: () =>
-          getErc20Allowance({
-            address: fromAssetId(assetId).assetReference,
-            spender: inboundAddress,
-            from: fromAccountId(accountId).account,
-            chainId: asset.chainId,
-          }),
-        validate: (allowanceCryptoBaseUnit: string) => {
-          if (isReset) return bnOrZero(allowanceCryptoBaseUnit).isZero()
-          return bnOrZero(allowanceCryptoBaseUnit).gte(amountCryptoBaseUnitOrZero)
-        },
-        interval: 15000,
-        maxAttempts: 60,
-      })
-
-      trackOpportunityEvent(
-        MixPanelEvent.DepositApprove,
-        {
-          opportunity: opportunityData,
-          fiatAmounts: [state.deposit.fiatAmount],
-          cryptoAmounts: [{ assetId, amountCryptoPrecision: state.deposit.cryptoAmount }],
-        },
-        assets,
-      )
-
-      onNext(isReset ? DefiStep.Approve : DefiStep.Confirm)
-      dispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-    } catch (error) {
-      showErrorToast(error)
-      dispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-    }
-  }, [
-    accountId,
-    accountNumber,
-    asset.assetId,
-    asset.chainId,
-    asset.precision,
-    assetId,
-    assets,
-    chainId,
-    dispatch,
-    inboundAddress,
-    isReset,
-    onNext,
-    opportunityData,
-    poll,
-    showErrorToast,
-    state?.deposit.cryptoAmount,
-    state?.deposit.fiatAmount,
-    state?.isExactAllowance,
-    wallet,
-  ])
-
-  const onExactAllowanceToggle = useCallback(() => {
-    if (!dispatch) return
-
-    dispatch({
-      type: ThorchainSaversDepositActionType.SET_IS_EXACT_ALLOWANCE,
-      payload: !state?.isExactAllowance,
-    })
-  }, [dispatch, state?.isExactAllowance])
-
-  const hasEnoughBalanceForGas = useMemo(
-    () =>
-      isSome(accountId) &&
-      isSome(estimatedGasCryptoPrecision) &&
-      canCoverTxFees({
-        feeAsset,
-        estimatedGasCryptoPrecision,
-        accountId,
-      }),
-    [accountId, feeAsset, estimatedGasCryptoPrecision],
-  )
-
-  const preFooter = useMemo(
-    () => (
-      <ApprovePreFooter
-        accountId={accountId}
-        action={DefiAction.Deposit}
-        feeAsset={feeAsset}
-        estimatedGasCryptoPrecision={estimatedGasCryptoPrecision}
-      />
-    ),
-    [accountId, feeAsset, estimatedGasCryptoPrecision],
-  )
-
-  const handleCancel = useCallback(() => {
-    navigate('/')
-  }, [navigate])
-
-  if (!isTokenDeposit || !inboundAddress || !state || !dispatch) return null
-
-  return (
-    <ReusableApprove
-      asset={asset}
-      spenderName={DefiProvider.ThorchainSavers}
-      feeAsset={feeAsset}
-      estimatedGasFeeCryptoPrecision={bnOrZero(estimatedGasCryptoPrecision).toFixed(5)}
-      disabled={!hasEnoughBalanceForGas}
-      fiatEstimatedGasFee={bnOrZero(estimatedGasCryptoPrecision)
-        .times(bnOrZero(feeMarketData?.price))
-        .toFixed(2)}
-      isReset={isReset}
-      loading={state.loading}
-      preFooter={preFooter}
-      isExactAllowance={state.isExactAllowance}
-      onCancel={handleCancel}
-      onConfirm={handleApprove}
-      spenderContractAddress={inboundAddress}
-      onToggle={onExactAllowanceToggle}
-    />
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Confirm.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Confirm.tsx
deleted file mode 100644
index 755518716d5..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Confirm.tsx
+++ /dev/null
@@ -1,591 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  AlertTitle,
-  Box,
-  Flex,
-  Skeleton,
-  Stack,
-  useToast,
-} from '@chakra-ui/react'
-import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { supportsETH } from '@shapeshiftoss/hdwallet-core/wallet'
-import { SwapperName } from '@shapeshiftoss/swapper'
-import { BigAmount, isUtxoChainId } from '@shapeshiftoss/utils'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import { useCallback, useContext, useEffect, useMemo } from 'react'
-import { useTranslate } from 'react-polyglot'
-
-import { ThorchainSaversDepositActionType } from '../DepositCommon'
-import { DepositContext } from '../DepositContext'
-
-import { Amount } from '@/components/Amount/Amount'
-import { AssetIcon } from '@/components/AssetIcon'
-import type { StepComponentProps } from '@/components/DeFi/components/Steps'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Row } from '@/components/Row/Row'
-import { RawText, Text } from '@/components/Text'
-import type { TextPropTypes } from '@/components/Text/Text'
-import { getChainAdapterManager } from '@/context/PluginProvider/chainAdapterSingleton'
-import { Confirm as ReusableConfirm } from '@/features/defi/components/Confirm/Confirm'
-import { Summary } from '@/features/defi/components/Summary'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useIsSmartContractAddress } from '@/hooks/useIsSmartContractAddress/useIsSmartContractAddress'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { fromThorBaseUnit, getThorchainFromAddress, toThorBaseUnit } from '@/lib/utils/thorchain'
-import { BASE_BPS_POINTS, RUNEPOOL_DEPOSIT_MEMO } from '@/lib/utils/thorchain/constants'
-import { useGetThorchainSaversDepositQuoteQuery } from '@/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
-import type { ThorchainSaversDepositQuoteResponseSuccess } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import {
-  getThorchainSaversPosition,
-  makeDaysToBreakEven,
-} from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-import {
-  selectAssetById,
-  selectAssets,
-  selectFeeAssetById,
-  selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioAccountMetadataByAccountId,
-  selectPortfolioCryptoBalanceByFilter,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type ConfirmProps = { accountId: AccountId | undefined } & StepComponentProps
-
-export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
-  const { state, dispatch: contextDispatch } = useContext(DepositContext)
-  const translate = useTranslate()
-  const mixpanel = getMixPanel()
-  // TODO: Allow user to set fee priority
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const { chainId, assetNamespace, assetReference } = query
-  const opportunity = useMemo(() => state?.opportunity, [state])
-  const assets = useAppSelector(selectAssets)
-
-  const chainAdapter = getChainAdapterManager().get(chainId)
-
-  const assetId = toAssetId({
-    chainId,
-    assetNamespace,
-    assetReference,
-  })
-
-  const isRunePool = assetId === thorchainAssetId
-
-  const asset = useAppSelector(state => selectAssetById(state, assetId))
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
-  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
-  if (!feeAsset) throw new Error(`Fee asset not found for AssetId ${assetId}`)
-
-  const marketData = useAppSelector(state => selectMarketDataByAssetIdUserCurrency(state, assetId))
-  const feeMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, feeAsset.assetId),
-  )
-
-  const accountFilter = useMemo(() => ({ accountId }), [accountId])
-  const accountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, accountFilter),
-  )
-  const bip44Params = accountMetadata?.bip44Params
-  // user info
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  // notify
-  const toast = useToast()
-
-  const feeAssetBalanceFilter = useMemo(
-    () => ({ assetId: feeAsset.assetId, accountId }),
-    [accountId, feeAsset.assetId],
-  )
-
-  const feeAssetBalance = useAppSelector(s =>
-    selectPortfolioCryptoBalanceByFilter(s, feeAssetBalanceFilter),
-  )
-
-  const amountCryptoBaseUnit = useMemo(
-    () =>
-      bn(
-        BigAmount.fromPrecision({
-          value: state?.deposit.cryptoAmount,
-          precision: asset.precision,
-        }).toBaseUnit(),
-      ),
-    [asset.precision, state?.deposit.cryptoAmount],
-  )
-
-  const selectQuoteData = useCallback(
-    (quote: ThorchainSaversDepositQuoteResponseSuccess) => {
-      const {
-        fees: { slippage_bps },
-        expected_amount_deposit: expectedAmountOutThorBaseUnit,
-      } = quote
-      const amountCryptoThorBaseUnit = toThorBaseUnit({
-        valueCryptoBaseUnit: amountCryptoBaseUnit,
-        asset,
-      })
-
-      // Total downside
-      const protocolFeeCryptoBaseUnit = (() => {
-        const thorchainFeeCryptoThorPrecision = fromThorBaseUnit(
-          amountCryptoThorBaseUnit.minus(expectedAmountOutThorBaseUnit),
-        )
-        return BigAmount.fromPrecision({
-          value: thorchainFeeCryptoThorPrecision,
-          precision: asset.precision,
-        }).toBaseUnit()
-      })()
-
-      const daysToBreakEven = opportunity
-        ? makeDaysToBreakEven({
-            amountCryptoBaseUnit,
-            asset,
-            apy: opportunity.apy ?? '0',
-            expectedAmountOutThorBaseUnit,
-          })
-        : undefined
-
-      // @TODO: verify that runepool deposit apply any slippage
-      const slippageCryptoAmountPrecision = (() => {
-        const slippagePercentage = bnOrZero(slippage_bps).div(BASE_BPS_POINTS).times(100)
-
-        // slippage going into position - e.g. 0.007 ETH for 5 ETH deposit
-        // This is NOT the same as the total THOR fees, which include the deposit fee in addition to the slippage
-        const cryptoSlippageAmountPrecision = bnOrZero(state?.deposit.cryptoAmount)
-          .times(slippagePercentage)
-          .div(100)
-        return cryptoSlippageAmountPrecision.toString()
-      })()
-
-      return { quote, slippageCryptoAmountPrecision, daysToBreakEven, protocolFeeCryptoBaseUnit }
-    },
-    [amountCryptoBaseUnit, asset, opportunity, state?.deposit.cryptoAmount],
-  )
-
-  const { data: quoteData, isLoading: isQuoteDataLoading } = useGetThorchainSaversDepositQuoteQuery(
-    {
-      asset,
-      amountCryptoBaseUnit,
-      select: selectQuoteData,
-      enabled: !isRunePool,
-    },
-  )
-
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', accountId, assetId],
-    queryFn:
-      accountId && wallet && accountMetadata
-        ? () =>
-            getThorchainFromAddress({
-              accountId,
-              assetId,
-              getPosition: getThorchainSaversPosition,
-              accountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
-  const memo = useMemo(() => {
-    if (isRunePool) return RUNEPOOL_DEPOSIT_MEMO
-    if (quoteData?.quote.memo) return quoteData.quote.memo
-
-    return null
-  }, [isRunePool, quoteData?.quote.memo])
-
-  const { isEstimatedFeesDataLoading, estimatedFeesData } = useSendThorTx({
-    accountId: accountId ?? null,
-    assetId,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: state?.deposit.cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit(),
-    action: isRunePool ? 'depositRunepool' : 'depositSavers',
-    memo,
-    fromAddress: fromAddress ?? null,
-  })
-
-  const { amountMinusFeesCryptoBaseUnit, amountMinusFeesCryptoPrecision } = useMemo(() => {
-    const depositAmount = BigAmount.fromPrecision({
-      value: state?.deposit.cryptoAmount,
-      precision: asset.precision,
-    })
-
-    if (isUtxoChainId(feeAsset.chainId)) {
-      return {
-        amountMinusFeesCryptoBaseUnit: depositAmount,
-        amountMinusFeesCryptoPrecision: state?.deposit.cryptoAmount,
-      }
-    }
-
-    if (!estimatedFeesData)
-      return {
-        amountMinusFeesCryptoBaseUnit: undefined,
-        amountMinusFeesCryptoPrecision: undefined,
-      }
-
-    if (
-      state?.deposit.sendMax &&
-      estimatedFeesData &&
-      !isUtxoChainId(feeAsset.chainId) &&
-      feeAsset.assetId === asset.assetId
-    ) {
-      const amountMinusFees = depositAmount.minus(
-        BigAmount.fromBaseUnit({
-          value: estimatedFeesData.txFeeCryptoBaseUnit,
-          precision: asset.precision,
-        }),
-      )
-      return {
-        amountMinusFeesCryptoBaseUnit: amountMinusFees,
-        amountMinusFeesCryptoPrecision: amountMinusFees.toPrecision(),
-      }
-    }
-
-    return {
-      amountMinusFeesCryptoBaseUnit: depositAmount,
-      amountMinusFeesCryptoPrecision: state?.deposit.cryptoAmount,
-    }
-  }, [
-    state?.deposit.cryptoAmount,
-    asset.precision,
-    feeAsset,
-    asset.assetId,
-    estimatedFeesData,
-    state?.deposit.sendMax,
-  ])
-
-  const { executeTransaction } = useSendThorTx({
-    accountId: accountId ?? null,
-    assetId,
-    amountCryptoBaseUnit: amountMinusFeesCryptoBaseUnit?.toBaseUnit() ?? null,
-    action: isRunePool ? 'depositRunepool' : 'depositSavers',
-    memo,
-    fromAddress: fromAddress ?? null,
-    enableEstimateFees: Boolean(
-      !state?.deposit.sendMax ||
-        isUtxoChainId(feeAsset.chainId) ||
-        feeAsset.assetId !== asset.assetId,
-    ),
-  })
-
-  const estimatedGasCryptoPrecision = useMemo(() => {
-    if (!estimatedFeesData) return
-    return BigAmount.fromBaseUnit({
-      value: estimatedFeesData.txFeeCryptoBaseUnit,
-      precision: feeAsset.precision,
-    }).toPrecision()
-  }, [estimatedFeesData, feeAsset.precision])
-
-  useEffect(() => {
-    if (!contextDispatch) return
-    if (!estimatedFeesData) return
-    if (!estimatedGasCryptoPrecision) return
-
-    contextDispatch({
-      type: ThorchainSaversDepositActionType.SET_DEPOSIT,
-      payload: {
-        estimatedGasCryptoPrecision,
-        networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-      },
-    })
-  }, [contextDispatch, estimatedFeesData, estimatedGasCryptoPrecision])
-
-  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
-    assetId,
-    swapperName: SwapperName.Thorchain,
-  })
-
-  const handleDeposit = useCallback(async () => {
-    if (!contextDispatch || !bip44Params || !accountId || !assetId) return
-    try {
-      if (!quoteData?.quote && !isRunePool) return
-      if (
-        !(
-          fromAddress &&
-          assetReference &&
-          wallet &&
-          supportsETH(wallet) &&
-          opportunity &&
-          chainAdapter
-        )
-      )
-        return
-
-      if (!state?.deposit.cryptoAmount) {
-        throw new Error('Cannot send 0-value THORCHain savers Tx')
-      }
-
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-
-      // Was the pool active when it was fetched at the time of the component mount
-      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
-      if (isTradingActive === false) {
-        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
-      }
-
-      // Refetch the trading active state JIT to ensure the pool didn't just become halted
-      const _isTradingActive = await refetchIsTradingActive()
-      if (_isTradingActive === false) {
-        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
-      }
-
-      const _txId = await executeTransaction()
-      if (!_txId) throw new Error('failed to broadcast transaction')
-
-      contextDispatch({
-        type: ThorchainSaversDepositActionType.SET_DEPOSIT,
-        payload: {
-          protocolFeeCryptoBaseUnit: quoteData?.protocolFeeCryptoBaseUnit,
-          maybeFromUTXOAccountAddress: fromAddress,
-        },
-      })
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_TXID, payload: _txId })
-      onNext(DefiStep.Status)
-      trackOpportunityEvent(
-        MixPanelEvent.DepositConfirm,
-        {
-          opportunity,
-          fiatAmounts: [state.deposit.fiatAmount],
-          cryptoAmounts: [{ assetId, amountCryptoPrecision: state.deposit.cryptoAmount }],
-        },
-        assets,
-      )
-    } catch (error) {
-      console.error(error)
-      toast({
-        position: 'top-right',
-        description: translate('common.transactionFailedBody'),
-        title: translate('common.transactionFailed'),
-        status: 'error',
-      })
-    } finally {
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-    }
-  }, [
-    contextDispatch,
-    bip44Params,
-    accountId,
-    assetId,
-    fromAddress,
-    assetReference,
-    wallet,
-    opportunity,
-    chainAdapter,
-    quoteData?.quote,
-    quoteData?.protocolFeeCryptoBaseUnit,
-    state?.deposit.cryptoAmount,
-    state?.deposit.fiatAmount,
-    isTradingActive,
-    refetchIsTradingActive,
-    executeTransaction,
-    onNext,
-    assets,
-    toast,
-    translate,
-    isRunePool,
-  ])
-
-  const handleCancel = useCallback(() => {
-    onNext(DefiStep.Info)
-  }, [onNext])
-
-  const hasEnoughBalanceForGas = useMemo(
-    () =>
-      feeAssetBalance
-        .minus(
-          BigAmount.fromPrecision({
-            value: state?.deposit.estimatedGasCryptoPrecision ?? 0,
-            precision: feeAsset?.precision ?? 0,
-          }),
-        )
-        .gte(0),
-    [feeAssetBalance, state?.deposit.estimatedGasCryptoPrecision, feeAsset],
-  )
-
-  useEffect(() => {
-    if (!hasEnoughBalanceForGas) {
-      mixpanel?.track(MixPanelEvent.InsufficientFunds)
-    }
-  }, [hasEnoughBalanceForGas, mixpanel])
-
-  const notEnoughGasTranslation: TextPropTypes['translation'] = useMemo(
-    () => ['modals.confirm.notEnoughGas', { assetSymbol: feeAsset.symbol }],
-    [feeAsset.symbol],
-  )
-
-  const { data: _isSmartContractAddress, isLoading: isAddressByteCodeLoading } =
-    useIsSmartContractAddress(fromAddress ?? '', chainId)
-
-  const disableSmartContractDeposit = useMemo(() => {
-    // This is either a smart contract address, or the bytecode is still loading - disable confirm
-    if (_isSmartContractAddress) return true
-
-    // All checks passed - this is an EOA address
-    return false
-  }, [_isSmartContractAddress])
-
-  const preFooter = useMemo(() => {
-    if (!_isSmartContractAddress) return null
-
-    return (
-      <Flex direction='column' gap={2}>
-        <Alert status='error' width='auto' fontSize='sm'>
-          <AlertIcon />
-          <Stack spacing={0}>
-            <AlertTitle>{translate('trade.errors.smartContractWalletNotSupported')}</AlertTitle>
-            <AlertDescription lineHeight='short'>
-              {translate('trade.thorSmartContractWalletUnsupported')}
-            </AlertDescription>
-          </Stack>
-        </Alert>
-      </Flex>
-    )
-  }, [_isSmartContractAddress, translate])
-
-  if (!state || !contextDispatch) return null
-
-  return (
-    <ReusableConfirm
-      onCancel={handleCancel}
-      onConfirm={handleDeposit}
-      preFooter={preFooter}
-      isDisabled={
-        !hasEnoughBalanceForGas ||
-        !fromAddress ||
-        disableSmartContractDeposit ||
-        isTradingActive === false
-      }
-      loading={
-        state.loading || !amountMinusFeesCryptoBaseUnit || !fromAddress || isAddressByteCodeLoading
-      }
-      loadingText={translate('common.confirm')}
-      headerText='modals.confirm.deposit.header'
-    >
-      <Summary>
-        <Row variant='vertical' p={4}>
-          <Row.Label>
-            <Text translation='modals.confirm.amountToDeposit' />
-          </Row.Label>
-          <Row px={0} fontWeight='medium'>
-            <Stack direction='row' alignItems='center'>
-              <AssetIcon size='xs' src={asset.icon} />
-              <RawText>{asset.name}</RawText>
-            </Stack>
-            <Row.Value>
-              <Skeleton isLoaded={!!amountMinusFeesCryptoPrecision}>
-                <Amount.Crypto value={amountMinusFeesCryptoPrecision} symbol={asset.symbol} />
-              </Skeleton>
-            </Row.Value>
-          </Row>
-        </Row>
-        {!isRunePool ? (
-          <Row variant='gutter'>
-            <Row.Label>{translate('common.slippage')}</Row.Label>
-            <Row.Value>
-              <Skeleton isLoaded={!isQuoteDataLoading}>
-                <Amount.Crypto
-                  value={quoteData?.slippageCryptoAmountPrecision ?? ''}
-                  symbol={asset.symbol}
-                />
-              </Skeleton>
-            </Row.Value>
-          </Row>
-        ) : null}
-        {!isRunePool ? (
-          <Row variant='gutter'>
-            <Row.Label>
-              <HelperTooltip label={translate('defi.modals.saversVaults.timeToBreakEven.tooltip')}>
-                {translate('defi.modals.saversVaults.timeToBreakEven.title')}
-              </HelperTooltip>
-            </Row.Label>
-            <Row.Value>
-              <Skeleton isLoaded={!isQuoteDataLoading}>
-                {translate(
-                  `defi.modals.saversVaults.${
-                    bnOrZero(quoteData?.daysToBreakEven).eq(1) ? 'day' : 'days'
-                  }`,
-                  { amount: quoteData?.daysToBreakEven ?? '0' },
-                )}
-              </Skeleton>
-            </Row.Value>
-          </Row>
-        ) : null}
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.protocolFee')}>
-              <Text translation='trade.protocolFee' />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Skeleton isLoaded={!isQuoteDataLoading}>
-              <Box textAlign='right'>
-                <Amount.Fiat
-                  fontWeight='bold'
-                  value={BigAmount.fromBaseUnit({
-                    value: quoteData?.protocolFeeCryptoBaseUnit ?? 0,
-                    precision: asset.precision,
-                  })
-                    .times(marketData?.price)
-                    .toPrecision()}
-                />
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={BigAmount.fromBaseUnit({
-                    value: quoteData?.protocolFeeCryptoBaseUnit ?? 0,
-                    precision: asset.precision,
-                  }).toPrecision()}
-                  symbol={asset.symbol}
-                />
-              </Box>
-            </Skeleton>
-          </Row.Value>
-        </Row>
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.minerFee')}>
-              <Text translation='trade.minerFee' />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Skeleton isLoaded={!isEstimatedFeesDataLoading}>
-              <Box textAlign='right'>
-                <Amount.Fiat
-                  fontWeight='bold'
-                  value={bnOrZero(estimatedGasCryptoPrecision)
-                    .times(bnOrZero(feeMarketData?.price))
-                    .toFixed()}
-                />
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={estimatedGasCryptoPrecision ?? '0'}
-                  symbol={feeAsset.symbol}
-                />
-              </Box>
-            </Skeleton>
-          </Row.Value>
-        </Row>
-      </Summary>
-      {!hasEnoughBalanceForGas && (
-        <Alert status='error' borderRadius='lg'>
-          <AlertIcon />
-          <Text translation={notEnoughGasTranslation} />
-        </Alert>
-      )}
-    </ReusableConfirm>
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx
deleted file mode 100644
index e1cf57dc757..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx
+++ /dev/null
@@ -1,977 +0,0 @@
-import { Skeleton } from '@chakra-ui/react'
-import type { AccountId } from '@shapeshiftoss/caip'
-import { fromAccountId, fromAssetId, thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { ContractType, getOrCreateContractByType } from '@shapeshiftoss/contracts'
-import type { Asset } from '@shapeshiftoss/types'
-import { BigAmount, isToken } from '@shapeshiftoss/utils'
-import { useQueryClient } from '@tanstack/react-query'
-import debounce from 'lodash/debounce'
-import pDebounce from 'p-debounce'
-import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router'
-import { encodeFunctionData, getAddress, maxUint256 } from 'viem'
-
-import { ThorchainSaversDepositActionType } from '../DepositCommon'
-import { DepositContext } from '../DepositContext'
-
-import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
-import { InfoAcknowledgement } from '@/components/Acknowledgement/InfoAcknowledgement'
-import { Amount } from '@/components/Amount/Amount'
-import type { StepComponentProps } from '@/components/DeFi/components/Steps'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Row } from '@/components/Row/Row'
-import type { DepositValues } from '@/features/defi/components/Deposit/Deposit'
-import { Deposit as ReusableDeposit } from '@/features/defi/components/Deposit/Deposit'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useAllowanceApprovalRequirements } from '@/hooks/queries/useAllowanceApprovalRequirements'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useNotificationToast } from '@/hooks/useNotificationToast'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { assertGetEvmChainAdapter, getFeesWithWalletEIP1559Support } from '@/lib/utils/evm'
-import { fetchHasEnoughBalanceForTxPlusFeesPlusSweep } from '@/lib/utils/thorchain/balance'
-import { BASE_BPS_POINTS, RUNEPOOL_DEPOSIT_MEMO } from '@/lib/utils/thorchain/constants'
-import { useGetThorchainSaversDepositQuoteQuery } from '@/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import { useThorchainMimirTimes } from '@/lib/utils/thorchain/hooks/useThorchainMimirTimes'
-import { formatSecondsToDuration } from '@/lib/utils/time'
-import { isUtxoChainId } from '@/lib/utils/utxo'
-import type { EstimatedFeesQueryKey } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
-import { queryFn as getEstimatedFeesQueryFn } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
-import type { IsSweepNeededQueryKey } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import {
-  getIsSweepNeeded,
-  isGetSweepNeededInput,
-  useIsSweepNeededQuery,
-} from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import {
-  isAboveDepositDustThreshold,
-  makeDaysToBreakEven,
-  THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT,
-} from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
-import {
-  selectAccountNumberByAccountId,
-  selectAssetById,
-  selectAssets,
-  selectEarnUserStakingOpportunityByUserStakingId,
-  selectFeeAssetById,
-  selectHighestStakingBalanceAccountIdByStakingId,
-  selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioCryptoBalanceByFilter,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type DepositProps = StepComponentProps & {
-  accountId?: AccountId | undefined
-  onAccountIdChange: AccountDropdownProps['onChange']
-  fromAddress: string | undefined
-}
-
-const percentOptions = [0.25, 0.5, 0.75, 1]
-
-export const Deposit: React.FC<DepositProps> = ({
-  accountId,
-  onAccountIdChange: handleAccountIdChange,
-  fromAddress,
-  onNext,
-}) => {
-  // Redeclared here as state field because of chicken-and-egg issues
-  const [isApprovalRequired, setIsApprovalRequired] = useState<boolean | undefined>(false)
-  const { state, dispatch: contextDispatch } = useContext(DepositContext)
-
-  const toast = useNotificationToast({ desktopPosition: 'top-right' })
-  const queryClient = useQueryClient()
-  const translate = useTranslate()
-  const [slippageCryptoAmountPrecision, setSlippageCryptoAmountPrecision] = useState<string | null>(
-    null,
-  )
-  const [daysToBreakEven, setDaysToBreakEven] = useState<string | null>(null)
-  const [shouldShowInfoAcknowledgement, setShouldShowInfoAcknowledgement] = useState(false)
-  const [depositValues, setDepositValues] = useState<DepositValues>()
-  const [inputValues, setInputValues] = useState<{
-    fiatAmount: string
-    cryptoAmount: string
-  } | null>(null)
-  const navigate = useNavigate()
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const { chainId, assetNamespace, assetReference } = query
-  const assets = useAppSelector(selectAssets)
-
-  const assetId = toAssetId({
-    chainId,
-    assetNamespace,
-    assetReference,
-  })
-
-  const isRunePool = assetId === thorchainAssetId
-
-  const isTokenDeposit = isToken(assetId)
-
-  const accountNumberFilter = useMemo(() => ({ accountId }), [accountId])
-  const accountNumber = useAppSelector(state =>
-    selectAccountNumberByAccountId(state, accountNumberFilter),
-  )
-
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
-  const opportunityId = useMemo(
-    () => (assetId ? toOpportunityId({ chainId, assetNamespace, assetReference }) : undefined),
-    [assetId, assetNamespace, assetReference, chainId],
-  )
-  const highestBalanceAccountIdFilter = useMemo(
-    () => ({ stakingId: opportunityId }),
-    [opportunityId],
-  )
-  const highestBalanceAccountId = useAppSelector(state =>
-    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
-  )
-  const opportunityDataFilter = useMemo(
-    () => ({
-      userStakingId: serializeUserStakingId(
-        accountId ?? highestBalanceAccountId ?? '',
-        opportunityId ?? '',
-      ),
-    }),
-    [accountId, highestBalanceAccountId, opportunityId],
-  )
-
-  const opportunityData = useAppSelector(state =>
-    selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter),
-  )
-
-  const asset: Asset | undefined = useAppSelector(state => selectAssetById(state, assetId))
-  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
-
-  const assetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId),
-  )
-  const feeAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
-  )
-
-  const assetPriceInFeeAsset = useMemo(() => {
-    return bnOrZero(assetMarketData?.price).div(bnOrZero(feeAssetMarketData?.price))
-  }, [assetMarketData?.price, feeAssetMarketData?.price])
-
-  const userAddress: string | undefined = accountId && fromAccountId(accountId).account
-  const balanceFilter = useMemo(() => ({ assetId, accountId }), [accountId, assetId])
-  // user info
-  const balanceCryptoBaseUnit = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, balanceFilter),
-  ).toBaseUnit()
-
-  const { data: thorchainMimirTimes, isLoading: isThorchainMimirTimesLoading } =
-    useThorchainMimirTimes()
-
-  const {
-    data: thorchainSaversDepositQuote,
-    isLoading: isThorchainSaversDepositQuoteLoading,
-    isSuccess: isThorchainSaversDepositQuoteSuccess,
-    isError: isThorchainSaversDepositQuoteError,
-    error: thorchainSaversDepositQuoteError,
-  } = useGetThorchainSaversDepositQuoteQuery({
-    asset,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: inputValues?.cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit(),
-    enabled: !isRunePool,
-  })
-
-  const memo = useMemo(() => {
-    if (isRunePool) return RUNEPOOL_DEPOSIT_MEMO
-
-    if (thorchainSaversDepositQuote?.memo) return thorchainSaversDepositQuote?.memo
-
-    return null
-  }, [isRunePool, thorchainSaversDepositQuote?.memo])
-
-  const {
-    estimatedFeesData,
-    isEstimatedFeesDataLoading,
-    outboundFeeCryptoBaseUnit,
-    inboundAddress,
-  } = useSendThorTx({
-    assetId,
-    accountId: accountId ?? null,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: inputValues?.cryptoAmount,
-      precision: asset?.precision ?? 0,
-    }).toBaseUnit(),
-    memo,
-    fromAddress: fromAddress ?? null,
-    action: isRunePool ? 'depositRunepool' : 'depositSavers',
-    enableEstimateFees: Boolean(!isApprovalRequired && bnOrZero(inputValues?.cryptoAmount).gt(0)),
-  })
-
-  const { isAllowanceApprovalRequired: _isApprovalRequired, isAllowanceResetRequired } =
-    useAllowanceApprovalRequirements({
-      assetId,
-      amountCryptoBaseUnit: BigAmount.fromPrecision({
-        value: inputValues?.cryptoAmount,
-        precision: asset?.precision ?? 0,
-      }).toBaseUnit(),
-      spender: inboundAddress,
-      from: accountId ? fromAccountId(accountId).account : undefined,
-    })
-
-  useEffect(() => {
-    setIsApprovalRequired(_isApprovalRequired)
-  }, [_isApprovalRequired, setIsApprovalRequired])
-
-  // TODO(gomes): this will work for UTXO but is invalid for tokens since they use diff. denoms
-  // the current workaround is to not do fee deduction for non-UTXO chains,
-  // but for consistency, we should for native EVM assets, and ensure this is a no-op for tokens
-  // Note when implementing this, fee checks/deduction will need to either be done for *native* assets only
-  // or handle different denoms for tokens/native assets and display insufficientFundsForProtocolFee copy
-  const getHasEnoughBalanceForTxPlusFees = useCallback(
-    ({
-      balanceCryptoBaseUnit,
-      amountCryptoPrecision,
-      txFeeCryptoBaseUnit,
-      precision,
-    }: {
-      balanceCryptoBaseUnit: string
-      amountCryptoPrecision: string
-      txFeeCryptoBaseUnit: string
-      precision: number
-    }) => {
-      const balanceCryptoBaseUnitBn = bnOrZero(balanceCryptoBaseUnit)
-      if (balanceCryptoBaseUnitBn.isZero()) return false
-
-      return bnOrZero(amountCryptoPrecision)
-        .plus(
-          BigAmount.fromBaseUnit({
-            value: txFeeCryptoBaseUnit,
-            precision: precision ?? 0,
-          }).toPrecision(),
-        )
-        .lte(
-          BigAmount.fromBaseUnit({
-            value: balanceCryptoBaseUnitBn,
-            precision: precision ?? 0,
-          }).toPrecision(),
-        )
-    },
-    [],
-  )
-
-  const isSweepNeededArgs = useMemo(
-    () => ({
-      assetId,
-      address: fromAddress,
-      amountCryptoBaseUnit: BigAmount.fromPrecision({
-        value: inputValues?.cryptoAmount ?? 0,
-        precision: feeAsset?.precision ?? 0,
-      }).toBaseUnit(),
-      txFeeCryptoBaseUnit: estimatedFeesData?.txFeeCryptoBaseUnit,
-      // Don't fetch sweep needed if there isn't enough balance for the tx + fees, since adding in a sweep Tx would obviously fail too
-      enabled: Boolean(
-        bnOrZero(inputValues?.cryptoAmount).gt(0) &&
-          estimatedFeesData &&
-          getHasEnoughBalanceForTxPlusFees({
-            precision: asset.precision,
-            balanceCryptoBaseUnit,
-            amountCryptoPrecision: inputValues?.cryptoAmount ?? '',
-            txFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-          }),
-      ),
-    }),
-    [
-      asset.precision,
-      assetId,
-      balanceCryptoBaseUnit,
-      estimatedFeesData,
-      feeAsset?.precision,
-      fromAddress,
-      getHasEnoughBalanceForTxPlusFees,
-      inputValues?.cryptoAmount,
-    ],
-  )
-
-  const { data: isSweepNeeded, isLoading: isSweepNeededLoading } =
-    useIsSweepNeededQuery(isSweepNeededArgs)
-
-  const handleContinue = useCallback(
-    async (formValues: DepositValues) => {
-      if (!feeAsset) return
-      if (!accountId) return
-      if (!userAddress) return
-      if (!inputValues) return
-      if (!opportunityData) return
-      if (!contextDispatch) return
-      if (!isApprovalRequired && !estimatedFeesData) return
-
-      // set deposit state for future use
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_DEPOSIT, payload: formValues })
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-
-      try {
-        if (estimatedFeesData) {
-          contextDispatch({
-            type: ThorchainSaversDepositActionType.SET_DEPOSIT,
-            payload: {
-              estimatedGasCryptoPrecision: BigAmount.fromBaseUnit({
-                value: estimatedFeesData.txFeeCryptoBaseUnit,
-                precision: feeAsset.precision,
-              }).toPrecision(),
-              networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-            },
-          })
-        }
-
-        const approvalFees = await (() => {
-          if (
-            !(isApprovalRequired || isAllowanceResetRequired) ||
-            !inboundAddress ||
-            accountNumber === undefined ||
-            !wallet
-          )
-            return undefined
-
-          const contract = getOrCreateContractByType({
-            address: fromAssetId(assetId).assetReference,
-            type: ContractType.ERC20,
-            chainId: asset.chainId,
-          })
-          if (!contract) return undefined
-
-          const data = encodeFunctionData({
-            abi: contract.abi,
-            functionName: 'approve',
-            args: [getAddress(inboundAddress), isAllowanceResetRequired ? 0n : maxUint256],
-          })
-
-          const adapter = assertGetEvmChainAdapter(chainId)
-
-          return getFeesWithWalletEIP1559Support({
-            adapter,
-            data,
-            to: fromAssetId(assetId).assetReference,
-            from: userAddress,
-            value: '0',
-            wallet,
-          })
-        })()
-        if (approvalFees) {
-          contextDispatch({
-            type: ThorchainSaversDepositActionType.SET_APPROVE,
-            payload: {
-              estimatedGasCryptoPrecision: BigAmount.fromBaseUnit({
-                value: approvalFees.networkFeeCryptoBaseUnit,
-                precision: feeAsset.precision,
-              }).toPrecision(),
-            },
-          })
-
-          onNext(isAllowanceResetRequired ? DefiStep.AllowanceReset : DefiStep.Approve)
-          return
-        }
-        onNext(isSweepNeeded ? DefiStep.Sweep : DefiStep.Confirm)
-        trackOpportunityEvent(
-          MixPanelEvent.DepositContinue,
-          {
-            opportunity: opportunityData,
-            fiatAmounts: [formValues.fiatAmount],
-            cryptoAmounts: [{ assetId, amountCryptoPrecision: formValues.cryptoAmount }],
-          },
-          assets,
-        )
-      } catch (error) {
-        console.error(error)
-        toast({
-          description: translate('common.somethingWentWrongBody'),
-          title: translate('common.somethingWentWrong'),
-          status: 'error',
-        })
-        contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-      } finally {
-        contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-      }
-    },
-    [
-      feeAsset,
-      accountId,
-      userAddress,
-      inputValues,
-      opportunityData,
-      contextDispatch,
-      isApprovalRequired,
-      estimatedFeesData,
-      onNext,
-      isSweepNeeded,
-      assetId,
-      assets,
-      isAllowanceResetRequired,
-      inboundAddress,
-      accountNumber,
-      wallet,
-      asset.chainId,
-      chainId,
-      toast,
-      translate,
-    ],
-  )
-
-  const handleCancel = useCallback(() => {
-    navigate(-1)
-  }, [navigate])
-
-  const outboundFeeInAssetCryptoBaseUnit = useMemo(() => {
-    if (!asset) return bn(0)
-    if (!feeAsset) return bn(0)
-    if (!outboundFeeCryptoBaseUnit) return bn(0)
-
-    const outboundFeeCryptoPrecision = BigAmount.fromBaseUnit({
-      value: outboundFeeCryptoBaseUnit,
-      precision: feeAsset.precision,
-    }).toPrecision()
-    const outboundFeeInAssetCryptoPrecision = bn(outboundFeeCryptoPrecision).div(
-      assetPriceInFeeAsset,
-    )
-
-    return BigAmount.fromPrecision({
-      value: outboundFeeInAssetCryptoPrecision,
-      precision: asset.precision,
-    }).toBaseUnit()
-  }, [outboundFeeCryptoBaseUnit, assetPriceInFeeAsset, asset, feeAsset])
-
-  const _validateCryptoAmount = useCallback(
-    async (value: string) => {
-      if (!accountId) return
-      if (state?.loading) return
-
-      const valueCryptoBaseUnit = BigAmount.fromPrecision({
-        value,
-        precision: asset.precision,
-      }).toBaseUnit()
-      const balanceCryptoPrecision = bn(
-        BigAmount.fromBaseUnit({
-          value: balanceCryptoBaseUnit,
-          precision: asset.precision,
-        }).toPrecision(),
-      )
-
-      if (balanceCryptoPrecision.isZero() || balanceCryptoPrecision.lt(value))
-        return 'common.insufficientFunds'
-
-      const valueCryptoPrecision = bnOrZero(value)
-      if (valueCryptoPrecision.isEqualTo(0)) return ''
-
-      const isBelowMinSellAmount = !isAboveDepositDustThreshold({ valueCryptoBaseUnit, assetId })
-      const isBelowOutboundFee =
-        bn(outboundFeeInAssetCryptoBaseUnit).gt(0) &&
-        bnOrZero(valueCryptoBaseUnit).lt(outboundFeeInAssetCryptoBaseUnit)
-
-      const minLimitCryptoPrecision = BigAmount.fromBaseUnit({
-        value: THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[assetId],
-        precision: asset.precision,
-      }).toPrecision()
-      const outboundFeeCryptoPrecision = BigAmount.fromBaseUnit({
-        value: outboundFeeInAssetCryptoBaseUnit,
-        precision: asset.precision,
-      }).toPrecision()
-      const minLimit = `${minLimitCryptoPrecision} ${asset.symbol}`
-      const outboundFeeLimit = `${outboundFeeCryptoPrecision} ${asset.symbol}`
-
-      if (isBelowMinSellAmount) return translate('trade.errors.amountTooSmall', { minLimit })
-      if (isBelowOutboundFee)
-        return translate('trade.errors.amountTooSmall', { minLimit: outboundFeeLimit })
-
-      const hasEnoughBalance = await (async () => {
-        // Only check for sweep + fees at this stage for UTXOs because of reconciliation - this is *not* required for EVM chains
-        // Since we already do basic balance checks earlier, we already know that the user has enough balance for the Tx,
-        // but potentially not for fees, which will be checked at confirm step
-        if (!isUtxoChainId(chainId)) return true
-
-        const { hasEnoughBalance: _hasEnoughBalance } =
-          await fetchHasEnoughBalanceForTxPlusFeesPlusSweep({
-            amountCryptoPrecision: value,
-            accountId,
-            asset,
-            type: 'deposit',
-            fromAddress,
-          })
-
-        return _hasEnoughBalance
-      })()
-
-      return hasEnoughBalance || 'common.insufficientFunds'
-    },
-    [
-      accountId,
-      state?.loading,
-      asset,
-      balanceCryptoBaseUnit,
-      assetId,
-      outboundFeeInAssetCryptoBaseUnit,
-      translate,
-      chainId,
-      fromAddress,
-    ],
-  )
-
-  const validateCryptoAmount = useCallback(
-    (value: string) => {
-      if (!contextDispatch) return
-
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-      return _validateCryptoAmount(value).finally(() => {
-        contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-      })
-    },
-    [_validateCryptoAmount, contextDispatch],
-  )
-
-  const validateCryptoAmountDebounced = useMemo(
-    () => pDebounce(validateCryptoAmount, 500),
-    [validateCryptoAmount],
-  )
-
-  const _validateFiatAmount = useCallback(
-    async (value: string) => {
-      if (!accountId) return
-      if (state?.loading) return
-      const valueCryptoPrecision = bnOrZero(value).div(bnOrZero(assetMarketData?.price))
-      const balanceCryptoPrecision = bn(
-        BigAmount.fromBaseUnit({
-          value: balanceCryptoBaseUnit,
-          precision: asset.precision,
-        }).toPrecision(),
-      )
-
-      const fiatBalance = balanceCryptoPrecision.times(bnOrZero(assetMarketData?.price))
-      if (fiatBalance.isZero() || fiatBalance.lt(value)) return 'common.insufficientFunds'
-
-      const valueCryptoBaseUnit = BigAmount.fromPrecision({
-        value: valueCryptoPrecision,
-        precision: asset.precision,
-      }).toBaseUnit()
-
-      const isBelowMinSellAmount = !isAboveDepositDustThreshold({ valueCryptoBaseUnit, assetId })
-      const isBelowOutboundFee =
-        bn(outboundFeeInAssetCryptoBaseUnit).gt(0) &&
-        bnOrZero(valueCryptoBaseUnit).lt(outboundFeeInAssetCryptoBaseUnit)
-
-      const minLimitCryptoPrecision = BigAmount.fromBaseUnit({
-        value: THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[assetId],
-        precision: asset.precision,
-      }).toPrecision()
-      const outboundFeeCryptoPrecision = BigAmount.fromBaseUnit({
-        value: outboundFeeInAssetCryptoBaseUnit,
-        precision: asset.precision,
-      }).toPrecision()
-      const minLimit = `${minLimitCryptoPrecision} ${asset.symbol}`
-      const outboundFeeLimit = `${outboundFeeCryptoPrecision} ${asset.symbol}`
-
-      if (isBelowMinSellAmount) return translate('trade.errors.amountTooSmall', { minLimit })
-      if (isBelowOutboundFee)
-        return translate('trade.errors.amountTooSmall', { minLimit: outboundFeeLimit })
-
-      const hasEnoughBalance = await (async () => {
-        // Only check for sweep + fees at this stage for UTXOs because of reconciliation - this is *not* required for EVM chains
-        // Since we already do basic balance checks earlier, we already know that the user has enough balance for the Tx,
-        // but potentially not for fees, which will be checked at confirm step
-        if (!isUtxoChainId(chainId)) return true
-
-        const { hasEnoughBalance: _hasEnoughBalance } =
-          await fetchHasEnoughBalanceForTxPlusFeesPlusSweep({
-            amountCryptoPrecision: valueCryptoPrecision.toFixed(),
-            accountId,
-            asset,
-            type: 'deposit',
-            fromAddress,
-          })
-
-        return _hasEnoughBalance
-      })()
-
-      return hasEnoughBalance || 'common.insufficientFunds'
-    },
-    [
-      accountId,
-      state?.loading,
-      assetMarketData?.price,
-      balanceCryptoBaseUnit,
-      asset,
-      assetId,
-      outboundFeeInAssetCryptoBaseUnit,
-      translate,
-      chainId,
-      fromAddress,
-    ],
-  )
-
-  const validateFiatAmount = useCallback(
-    (value: string) => {
-      if (!contextDispatch) return
-
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-      return _validateFiatAmount(value).finally(() => {
-        contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-      })
-    },
-    [_validateFiatAmount, contextDispatch],
-  )
-
-  const validateFiatAmountDebounced = useMemo(
-    () => pDebounce(validateFiatAmount, 500),
-    [validateFiatAmount],
-  )
-
-  const balanceCryptoPrecision = useMemo(
-    () =>
-      bn(
-        BigAmount.fromBaseUnit({
-          value: balanceCryptoBaseUnit,
-          precision: asset.precision,
-        }).toPrecision(),
-      ),
-    [balanceCryptoBaseUnit, asset?.precision],
-  )
-  const fiatAmountAvailable = useMemo(
-    () => bnOrZero(balanceCryptoPrecision).times(bnOrZero(assetMarketData?.price)),
-    [balanceCryptoPrecision, assetMarketData?.price],
-  )
-
-  const setIsSendMax = useCallback(
-    (isSendMax?: boolean) => {
-      if (!contextDispatch) return
-
-      contextDispatch({
-        type: ThorchainSaversDepositActionType.SET_DEPOSIT,
-        payload: { sendMax: Boolean(isSendMax) },
-      })
-    },
-    [contextDispatch],
-  )
-  const handlePercentClick = useCallback(
-    async (_percent: number) => {
-      // Arbitrary buffer on UTXO max sends to account for possible UTXO set discrepancies
-      const percent = isUtxoChainId(asset.chainId) && _percent === 1 ? 0.99 : _percent
-
-      if (!contextDispatch) return { percentageCryptoAmount: '0', percentageFiatAmount: '0' }
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
-      setIsSendMax(percent === 1)
-
-      const _percentageCryptoAmountPrecisionBeforeTxFees = bnOrZero(balanceCryptoPrecision)
-        .times(percent)
-        .dp(asset.precision)
-
-      const estimateFeesQueryEnabled = Boolean(
-        fromAddress && accountId && isUtxoChainId(asset.chainId),
-      )
-      const estimatedFeesQueryArgs = {
-        estimateFeesInput: {
-          amountCryptoPrecision: _percentageCryptoAmountPrecisionBeforeTxFees.toFixed(),
-          // The same as assetId since this only runs for UTXOs
-          feeAssetId: assetId,
-          assetId,
-          to: fromAddress ?? '',
-          sendMax: false,
-          accountId: accountId ?? '',
-          contractAddress: undefined,
-        },
-        feeAsset,
-        feeAssetMarketData,
-        enabled: Boolean(accountId && feeAsset?.assetId && isUtxoChainId(asset.chainId)),
-      }
-      const estimatedFeesQueryKey: EstimatedFeesQueryKey = ['estimateFees', estimatedFeesQueryArgs]
-
-      const _estimatedFeesData = estimateFeesQueryEnabled
-        ? await queryClient.fetchQuery({
-            queryKey: estimatedFeesQueryKey,
-            queryFn: getEstimatedFeesQueryFn,
-          })
-        : undefined
-
-      const isSweepNeededQueryEnabled = Boolean(
-        _percentageCryptoAmountPrecisionBeforeTxFees.gt(0) && _estimatedFeesData,
-      )
-
-      const isSweepNeededQueryArgs = {
-        assetId,
-        address: fromAddress,
-        // Assume 0 fees, so that sweep needed properly return true/false
-        // The reason this works is because the final amount we're getting *is* fee-deducted, so we don't want to consider fees in this specific call
-        txFeeCryptoBaseUnit: '0',
-        amountCryptoBaseUnit: BigAmount.fromPrecision({
-          value: _percentageCryptoAmountPrecisionBeforeTxFees,
-          precision: asset.precision,
-        }).toBaseUnit(),
-      }
-
-      const isSweepNeededQueryKey: IsSweepNeededQueryKey = ['isSweepNeeded', isSweepNeededQueryArgs]
-      const _isSweepNeeded =
-        isSweepNeededQueryEnabled && isGetSweepNeededInput(isSweepNeededQueryArgs)
-          ? await queryClient.fetchQuery({
-              queryKey: isSweepNeededQueryKey,
-              queryFn: () => getIsSweepNeeded(isSweepNeededQueryArgs),
-            })
-          : undefined
-
-      const isEstimateSweepFeesQueryEnabled = Boolean(
-        _isSweepNeeded && accountId && isUtxoChainId(asset.chainId),
-      )
-      const estimatedSweepFeesQueryArgs = {
-        feeAsset,
-        feeAssetMarketData,
-        estimateFeesInput: {
-          amountCryptoPrecision: '0',
-          assetId,
-          // The same as assetId since this only runs for UTXOs
-          feeAssetId: assetId,
-          to: fromAddress ?? '',
-          sendMax: true,
-          accountId: accountId ?? '',
-          contractAddress: undefined,
-        },
-        enabled: isEstimateSweepFeesQueryEnabled,
-      }
-      const estimatedSweepFeesQueryKey: EstimatedFeesQueryKey = [
-        'estimateFees',
-        estimatedSweepFeesQueryArgs,
-      ]
-      const _estimatedSweepFeesData = isEstimateSweepFeesQueryEnabled
-        ? await queryClient.fetchQuery({
-            queryKey: estimatedSweepFeesQueryKey,
-            queryFn: getEstimatedFeesQueryFn,
-          })
-        : undefined
-
-      const _percentageCryptoAmountPrecisionAfterTxFeesAndSweep =
-        _percentageCryptoAmountPrecisionBeforeTxFees
-          .minus(
-            BigAmount.fromBaseUnit({
-              value: _estimatedFeesData?.txFeeCryptoBaseUnit ?? 0,
-              precision: asset.precision,
-            }).toPrecision(),
-          )
-          .minus(
-            BigAmount.fromBaseUnit({
-              value: _estimatedSweepFeesData?.txFeeCryptoBaseUnit ?? 0,
-              precision: asset.precision,
-            }).toPrecision(),
-          )
-
-      const _percentageFiatAmount = _percentageCryptoAmountPrecisionAfterTxFeesAndSweep.times(
-        bnOrZero(assetMarketData?.price),
-      )
-      contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: false })
-      return {
-        percentageCryptoAmount: _percentageCryptoAmountPrecisionAfterTxFeesAndSweep.toFixed(),
-        percentageFiatAmount: _percentageFiatAmount.toFixed(),
-      }
-    },
-    [
-      asset.chainId,
-      asset.precision,
-      contextDispatch,
-      setIsSendMax,
-      balanceCryptoPrecision,
-      fromAddress,
-      accountId,
-      assetId,
-      feeAsset,
-      feeAssetMarketData,
-      queryClient,
-      assetMarketData?.price,
-    ],
-  )
-
-  useEffect(() => {
-    if (isThorchainSaversDepositQuoteLoading) return
-    if (!opportunityData?.apy) return
-    if (!(accountId && inputValues && asset && feeAsset)) return
-    const { cryptoAmount } = inputValues
-    const amountCryptoBaseUnit = BigAmount.fromPrecision({
-      value: cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit()
-
-    if (bn(amountCryptoBaseUnit).isZero()) return
-
-    // TODO(gomes): we should now be able to return these from the query itself to make things cleaner
-    const debounced = debounce(() => {
-      if (isThorchainSaversDepositQuoteError)
-        throw new Error(thorchainSaversDepositQuoteError.message)
-      if (!opportunityData.apy) return
-
-      const quote = thorchainSaversDepositQuote
-
-      if (!quote) return
-
-      const {
-        fees: { slippage_bps },
-        expected_amount_deposit: expectedAmountOutThorBaseUnit,
-      } = quote
-
-      const slippagePercentage = bnOrZero(slippage_bps).div(BASE_BPS_POINTS).times(100)
-      // slippage going into position - 0.007 ETH for 5 ETH deposit
-      // This is NOT the same as the total THOR fees, which include the deposit fee in addition to the slippage
-      const cryptoSlippageAmountPrecision = bnOrZero(cryptoAmount)
-        .times(slippagePercentage)
-        .div(100)
-      setSlippageCryptoAmountPrecision(cryptoSlippageAmountPrecision.toString())
-
-      // daily upside
-      const daysToBreakEven = makeDaysToBreakEven({
-        expectedAmountOutThorBaseUnit,
-        amountCryptoBaseUnit,
-        asset,
-        apy: opportunityData.apy,
-      })
-      setDaysToBreakEven(daysToBreakEven)
-    })
-
-    debounced()
-
-    // cancel the previous debounce when inputValues changes to avoid race conditions
-    // and always ensure the latest value is used
-    return debounced.cancel
-  }, [
-    accountId,
-    asset,
-    feeAsset,
-    inputValues,
-    isThorchainSaversDepositQuoteError,
-    isThorchainSaversDepositQuoteLoading,
-    isTokenDeposit,
-    opportunityData?.apy,
-    thorchainSaversDepositQuote,
-    thorchainSaversDepositQuoteError?.message,
-  ])
-
-  const handleInputChange = useCallback(
-    ({ fiatAmount, cryptoAmount }: { fiatAmount: string; cryptoAmount: string }) => {
-      setInputValues({ fiatAmount, cryptoAmount })
-    },
-    [],
-  )
-
-  const cryptoInputValidation = useMemo(
-    () => ({
-      required: true,
-      validate: { validateCryptoAmountDebounced },
-    }),
-    [validateCryptoAmountDebounced],
-  )
-
-  const fiatInputValidation = useMemo(
-    () => ({
-      required: true,
-      validate: { validateFiatAmountDebounced },
-    }),
-    [validateFiatAmountDebounced],
-  )
-
-  const handleContinueOrAcknowledgement = useCallback(
-    (formValues: DepositValues) => {
-      setDepositValues(formValues)
-      if (isRunePool && thorchainMimirTimes?.runePoolDepositMaturityTime) {
-        setShouldShowInfoAcknowledgement(true)
-        return
-      }
-
-      if (!isRunePool && thorchainMimirTimes?.liquidityLockupTime) {
-        setShouldShowInfoAcknowledgement(true)
-        return
-      }
-
-      handleContinue(formValues)
-    },
-    [thorchainMimirTimes, isRunePool, handleContinue],
-  )
-
-  const handleAcknowledge = useCallback(() => {
-    if (!depositValues) return
-    handleContinue(depositValues)
-  }, [depositValues, handleContinue])
-
-  if (!state || !contextDispatch || !opportunityData) return null
-
-  return (
-    <>
-      <InfoAcknowledgement
-        message={translate('defi.liquidityLockupWarning', {
-          time: formatSecondsToDuration(
-            isRunePool
-              ? thorchainMimirTimes?.runePoolDepositMaturityTime ?? 0
-              : thorchainMimirTimes?.liquidityLockupTime ?? 0,
-          ),
-        })}
-        onAcknowledge={handleAcknowledge}
-        shouldShowAcknowledgement={shouldShowInfoAcknowledgement}
-        setShouldShowAcknowledgement={setShouldShowInfoAcknowledgement}
-      />
-      <ReusableDeposit
-        accountId={accountId}
-        onAccountIdChange={handleAccountIdChange}
-        asset={asset}
-        apy={opportunityData.apy ?? undefined}
-        cryptoAmountAvailable={balanceCryptoPrecision.toPrecision()}
-        cryptoInputValidation={cryptoInputValidation}
-        fiatAmountAvailable={fiatAmountAvailable.toFixed(2)}
-        fiatInputValidation={fiatInputValidation}
-        marketData={assetMarketData}
-        onCancel={handleCancel}
-        onPercentClick={handlePercentClick}
-        onContinue={handleContinueOrAcknowledgement}
-        onChange={handleInputChange}
-        percentOptions={percentOptions}
-        enableSlippage={false}
-        isLoading={
-          isEstimatedFeesDataLoading ||
-          isSweepNeededLoading ||
-          isThorchainSaversDepositQuoteLoading ||
-          isThorchainMimirTimesLoading ||
-          state.loading
-        }
-      >
-        {!isRunePool ? (
-          <>
-            <Row>
-              <Row.Label>{translate('common.slippage')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isThorchainSaversDepositQuoteSuccess}>
-                  <Amount.Crypto
-                    value={slippageCryptoAmountPrecision ?? ''}
-                    symbol={asset.symbol}
-                  />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row>
-              <Row.Label>
-                <HelperTooltip
-                  label={translate('defi.modals.saversVaults.timeToBreakEven.tooltip')}
-                >
-                  {translate('defi.modals.saversVaults.timeToBreakEven.title')}
-                </HelperTooltip>
-              </Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isThorchainSaversDepositQuoteSuccess}>
-                  {translate(
-                    `defi.modals.saversVaults.${bnOrZero(daysToBreakEven).eq(1) ? 'day' : 'days'}`,
-                    { amount: daysToBreakEven ?? '0' },
-                  )}
-                </Skeleton>
-              </Row.Value>
-            </Row>
-          </>
-        ) : null}
-      </ReusableDeposit>
-    </>
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Dust/Dust.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Dust/Dust.tsx
deleted file mode 100644
index 94d15b68262..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Dust/Dust.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { ArrowDownIcon, WarningIcon } from '@chakra-ui/icons'
-import { Avatar, Box, Button, Divider, Flex, Stack, useColorModeValue } from '@chakra-ui/react'
-import type { AccountId } from '@shapeshiftoss/caip'
-import qs from 'qs'
-import React, { useCallback } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
-import { Amount } from '@/components/Amount/Amount'
-import { Row } from '@/components/Row/Row'
-import { Text } from '@/components/Text'
-import { Address } from '@/components/TransactionHistoryRows/TransactionDetails/Address'
-import { DefiModalHeader } from '@/features/defi/components/DefiModal/DefiModalHeader'
-import { Summary } from '@/features/defi/components/Summary'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiAction } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-
-type DustProps = {
-  accountId: AccountId | undefined
-  onAccountIdChange: AccountDropdownProps['onChange']
-}
-
-const arrowDownIcon = <ArrowDownIcon />
-const divider = <Divider />
-const summaryDivider = <></>
-
-const minWidthProps = { base: '100%', md: '500px' }
-const maxWidthProps = { base: 'full', md: '500px' }
-
-export const Dust: React.FC<DustProps> = () => {
-  const translate = useTranslate()
-  const mixpanel = getMixPanel()
-  const { query, location } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const navigate = useNavigate()
-
-  const handleBack = useCallback(() => {
-    navigate({
-      pathname: location.pathname,
-      search: qs.stringify({
-        ...query,
-        modal: DefiAction.Overview,
-      }),
-    })
-  }, [navigate, location.pathname, query])
-
-  const handleConfirm = useCallback(() => {
-    mixpanel?.track(MixPanelEvent.DustConfirm)
-    navigate({
-      pathname: location.pathname,
-      search: qs.stringify({
-        ...query,
-        modal: DefiAction.Withdraw,
-      }),
-    })
-  }, [navigate, location.pathname, mixpanel, query])
-
-  return (
-    <Flex width='full' minWidth={minWidthProps} maxWidth={maxWidthProps} flexDir='column'>
-      <DefiModalHeader title={translate('defi.modals.saversVaults.sendDust')} onBack={handleBack} />
-      <Stack spacing={0} divider={divider}>
-        <Row variant='vert-gutter' gap={2} alignItems='center'>
-          <Row.Label>
-            <Avatar
-              icon={arrowDownIcon}
-              colorScheme='blue'
-              bg={useColorModeValue('gray.200', 'gray.700')}
-              color={useColorModeValue('blue.500', 'blue.200')}
-            >
-              <WarningIcon
-                position='absolute'
-                color={useColorModeValue('yellow.500', 'yellow.200')}
-                right={0}
-                top={0}
-              />
-            </Avatar>
-          </Row.Label>
-          <Row.Value textAlign='center'>
-            <Text fontWeight='medium' translation='defi.modals.saversVaults.sendDustBody' />
-          </Row.Value>
-        </Row>
-        <Row variant='vert-gutter' alignItems='center' gap={0} py={8}>
-          <Row.Value>
-            <Amount.Crypto fontSize='3xl' value='0.01' symbol='BTC' />
-          </Row.Value>
-          <Row.Label>
-            <Amount.Fiat fontSize='2xl' value='5.00' color='text.subtle' prefix='≈' />
-          </Row.Label>
-        </Row>
-        <Summary bg='transparent' borderWidth={0} px={8} py={6} divider={summaryDivider}>
-          <Row variant='gutter' px={0}>
-            <Row.Label>{translate('defi.modals.saversVaults.addressToSendTo')}</Row.Label>
-            <Row.Value fontSize='md'>
-              <Address explorerAddressLink='https://etherscan.io/address/' address='0000' />
-            </Row.Value>
-          </Row>
-          <Row variant='gutter' px={0}>
-            <Row.Label>{translate('defi.modals.saversVaults.protocolFee')}</Row.Label>
-            <Row.Value>
-              <Box textAlign='right'>
-                <Amount.Fiat fontWeight='bold' value='0' />
-                <Amount.Crypto color='text.subtle' value='0' symbol='BTC' />
-              </Box>
-            </Row.Value>
-          </Row>
-          <Stack width='full' direction='row'>
-            <Button size='lg' colorScheme='gray' width='full' onClick={handleBack}>
-              {translate('modals.confirm.cancel')}
-            </Button>
-            <Button
-              size='lg-multiline'
-              width='full'
-              colorScheme='blue'
-              data-test='defi-modal-send-dust-confirm'
-              onClick={handleConfirm}
-            >
-              {translate('defi.modals.saversVaults.sendDust')}
-            </Button>
-          </Stack>
-        </Summary>
-      </Stack>
-    </Flex>
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx
deleted file mode 100644
index dd44a60b0da..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx
+++ /dev/null
@@ -1,513 +0,0 @@
-import { ArrowDownIcon, ArrowUpIcon } from '@chakra-ui/icons'
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  AlertTitle,
-  Button,
-  Center,
-  Flex,
-  Link,
-  Progress,
-  useColorModeValue,
-} from '@chakra-ui/react'
-import { QueryStatus } from '@reduxjs/toolkit/query'
-import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { SwapperName } from '@shapeshiftoss/swapper'
-import type { Asset } from '@shapeshiftoss/types'
-import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import BigNumber from 'bignumber.js'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { FaTwitter } from 'react-icons/fa'
-import { useTranslate } from 'react-polyglot'
-
-import { ThorchainSaversEmpty } from './ThorchainSaversEmpty'
-
-import type { AccountDropdownProps } from '@/components/AccountDropdown/AccountDropdown'
-import { Amount } from '@/components/Amount/Amount'
-import { CircularProgress } from '@/components/CircularProgress/CircularProgress'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Text } from '@/components/Text'
-import type { DefiButtonProps } from '@/features/defi/components/DefiActionButtons'
-import { Overview } from '@/features/defi/components/Overview/Overview'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiAction } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { getThorchainFromAddress } from '@/lib/utils/thorchain'
-import { useGetThorchainSaversDepositQuoteQuery } from '@/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery'
-import { formatSecondsToDuration } from '@/lib/utils/time'
-import { useIsLendingActive } from '@/pages/Lending/hooks/useIsLendingActive'
-import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
-import type { ThorchainSaversStakingSpecificMetadata } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import {
-  getThorchainSaversPosition,
-  THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT,
-} from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-import type { StakingId } from '@/state/slices/opportunitiesSlice/types'
-import { DefiProvider, DefiType } from '@/state/slices/opportunitiesSlice/types'
-import {
-  isSaversUserStakingOpportunity,
-  makeDefiProviderDisplayName,
-  serializeUserStakingId,
-  toOpportunityId,
-} from '@/state/slices/opportunitiesSlice/utils'
-import {
-  selectAssetById,
-  selectAssets,
-  selectEarnUserStakingOpportunityByUserStakingId,
-  selectFirstAccountIdByChainId,
-  selectHighestStakingBalanceAccountIdByStakingId,
-  selectMarketDataByAssetIdUserCurrency,
-  selectOpportunitiesApiQueriesByFilter,
-  selectPortfolioAccountMetadataByAccountId,
-  selectStakingOpportunityByFilter,
-  selectTxsByFilter,
-  selectUnderlyingStakingAssetsWithBalancesAndIcons,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type OverviewProps = {
-  accountId: AccountId | undefined
-  onAccountIdChange: AccountDropdownProps['onChange']
-}
-
-const faTwitterIcon = <FaTwitter />
-
-export const ThorchainSaversOverview: React.FC<OverviewProps> = ({
-  accountId,
-  onAccountIdChange: handleAccountIdChange,
-}) => {
-  const translate = useTranslate()
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const [hideEmptyState, setHideEmptyState] = useState(false)
-  const { chainId, assetReference, assetNamespace } = query
-  const alertBg = useColorModeValue('gray.200', 'gray.900')
-
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const { isLendingActive, isMimirLoading } = useIsLendingActive()
-
-  const assetId = toAssetId({
-    chainId,
-    assetNamespace,
-    assetReference,
-  })
-  const assets = useAppSelector(selectAssets)
-  const asset = useAppSelector(state => selectAssetById(state, assetId))
-
-  const isRunePool = assetId === thorchainAssetId
-
-  const mockDepositAmountCryptoBaseUnit = useMemo(
-    () =>
-      BigNumber.max(
-        THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[assetId],
-        BigAmount.fromPrecision({ value: 1, precision: asset?.precision ?? 0 }).toBaseUnit(),
-      ),
-    [assetId, asset?.precision],
-  )
-
-  const { isLoading: isMockDepositQuoteLoading, error } = useGetThorchainSaversDepositQuoteQuery({
-    asset,
-    amountCryptoBaseUnit: mockDepositAmountCryptoBaseUnit,
-    enabled: !isRunePool,
-  })
-
-  const isHardCapReached = useMemo(
-    () => (error ? error.message.includes('add liquidity rune is more than bond') : false),
-    [error],
-  )
-
-  const marketData = useAppSelector(state => selectMarketDataByAssetIdUserCurrency(state, assetId))
-
-  const opportunityId = useMemo(
-    () => toOpportunityId({ chainId, assetNamespace, assetReference }),
-    [assetNamespace, assetReference, chainId],
-  )
-  const highestBalanceAccountIdFilter = useMemo(
-    () => ({ stakingId: opportunityId }),
-    [opportunityId],
-  )
-  const highestStakingBalanceAccountId = useAppSelector(state =>
-    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
-  )
-  const defaultAccountId = useAppSelector(state => selectFirstAccountIdByChainId(state, chainId))
-  const maybeAccountId = useMemo(
-    () => accountId ?? highestStakingBalanceAccountId ?? defaultAccountId,
-    [accountId, defaultAccountId, highestStakingBalanceAccountId],
-  )
-
-  const { isTradingActive, isLoading: isTradingActiveLoading } = useIsTradingActive({
-    assetId,
-    swapperName: SwapperName.Thorchain,
-  })
-
-  const isThorchainSaversDepositEnabled = useFeatureFlag('SaversVaultsDeposit')
-  const isThorchainSaversWithdrawalsEnabled = useFeatureFlag('SaversVaultsWithdraw')
-
-  const isRunePoolDepositEnabled = useFeatureFlag('RunePoolDeposit')
-  const isRunepoolWithdrawEnabled = useFeatureFlag('RunePoolWithdraw')
-
-  useEffect(() => {
-    if (!maybeAccountId) return
-    handleAccountIdChange(maybeAccountId)
-  }, [handleAccountIdChange, maybeAccountId])
-
-  const opportunityDataFilter = useMemo(() => {
-    if (!maybeAccountId?.length) return
-
-    return {
-      userStakingId: serializeUserStakingId(
-        maybeAccountId,
-        toOpportunityId({
-          chainId,
-          assetNamespace,
-          assetReference,
-        }),
-      ),
-    }
-  }, [assetNamespace, assetReference, chainId, maybeAccountId])
-
-  const earnOpportunityData = useAppSelector(state =>
-    opportunityDataFilter
-      ? selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter)
-      : undefined,
-  )
-
-  const opportunityMetadataFilter = useMemo(() => ({ stakingId: assetId as StakingId }), [assetId])
-  const opportunityMetadata = useAppSelector(state =>
-    selectStakingOpportunityByFilter(state, opportunityMetadataFilter),
-  ) as ThorchainSaversStakingSpecificMetadata
-
-  const currentCapFillPercentage = bnOrZero(opportunityMetadata?.tvl)
-    .div(bnOrZero(opportunityMetadata?.saversMaxSupplyFiat))
-    .times(100)
-    .toNumber()
-
-  const underlyingAssetsFiatBalanceCryptoPrecision = useMemo(() => {
-    if (!asset || !earnOpportunityData?.underlyingAssetId) return '0'
-
-    const cryptoAmount = BigAmount.fromBaseUnit({
-      value: earnOpportunityData?.stakedAmountCryptoBaseUnit ?? '0',
-      precision: asset.precision,
-    }).toPrecision()
-    const price = marketData?.price
-    return bnOrZero(cryptoAmount).times(bnOrZero(price)).toString()
-  }, [
-    asset,
-    marketData,
-    earnOpportunityData?.stakedAmountCryptoBaseUnit,
-    earnOpportunityData?.underlyingAssetId,
-  ])
-
-  const underlyingAssetId = useMemo(
-    () => earnOpportunityData?.underlyingAssetIds?.[0],
-    [earnOpportunityData?.underlyingAssetIds],
-  )
-  const underlyingAsset: Asset | undefined = useMemo(
-    () => assets[underlyingAssetId ?? ''],
-    [assets, underlyingAssetId],
-  )
-  const underlyingAssetsWithBalancesAndIcons = useAppSelector(state =>
-    opportunityDataFilter
-      ? selectUnderlyingStakingAssetsWithBalancesAndIcons(state, opportunityDataFilter)
-      : undefined,
-  )
-
-  const hasPendingTxsFilter = useMemo(
-    () => ({
-      accountId,
-      assetId,
-    }),
-    [accountId, assetId],
-  )
-  const hasPendingTxs = useAppSelector(state => selectTxsByFilter(state, hasPendingTxsFilter)).some(
-    tx => tx.status === TxStatus.Pending,
-  )
-
-  const pendingQueriesFilter = useMemo(
-    () => ({
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-      queryStatus: QueryStatus.pending,
-    }),
-    [],
-  )
-  const hasPendingQueries = Boolean(
-    useAppSelector(state => selectOpportunitiesApiQueriesByFilter(state, pendingQueriesFilter))
-      .length,
-  )
-
-  const remainingLockupTime = useMemo(() => {
-    if (!isSaversUserStakingOpportunity(earnOpportunityData)) return 0
-    return Math.max(earnOpportunityData.dateUnlocked - Math.floor(Date.now() / 1000), 0)
-  }, [earnOpportunityData])
-
-  const accountFilter = useMemo(() => ({ accountId: maybeAccountId }), [maybeAccountId])
-
-  const accountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, accountFilter),
-  )
-
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', accountId, assetId, opportunityId],
-    queryFn:
-      accountId && wallet && accountMetadata
-        ? () =>
-            getThorchainFromAddress({
-              accountId,
-              assetId,
-              opportunityId,
-              getPosition: getThorchainSaversPosition,
-              accountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
-  const makeDefaultMenu = useCallback(
-    ({
-      isFull,
-      hasPendingTxs,
-      hasPendingQueries,
-      isHaltedDeposits,
-      isDisabledDeposits,
-      isDisabledWithdrawals,
-      remainingLockupTime,
-    }: {
-      isFull?: boolean
-      hasPendingTxs?: boolean
-      hasPendingQueries?: boolean
-      isHaltedDeposits?: boolean
-      isDisabledDeposits?: boolean
-      isDisabledWithdrawals?: boolean
-      remainingLockupTime?: number
-    } = {}): DefiButtonProps[] => [
-      ...(isFull
-        ? []
-        : [
-            {
-              label: 'common.deposit',
-              icon: <ArrowUpIcon />,
-              action: DefiAction.Deposit,
-              isDisabled:
-                isFull ||
-                hasPendingTxs ||
-                hasPendingQueries ||
-                isHaltedDeposits ||
-                isDisabledDeposits,
-              toolTip: (() => {
-                if (isDisabledDeposits)
-                  return translate('defi.modals.saversVaults.disabledDepositTitle')
-                if (isHaltedDeposits)
-                  return translate('defi.modals.saversVaults.haltedDepositTitle')
-                if (hasPendingTxs || hasPendingQueries)
-                  return translate('defi.modals.saversVaults.cannotDepositWhilePendingTx')
-              })(),
-            },
-          ]),
-      {
-        label: 'common.withdraw',
-        icon: <ArrowDownIcon />,
-        action: DefiAction.Withdraw,
-        isDisabled:
-          hasPendingTxs ||
-          hasPendingQueries ||
-          isDisabledWithdrawals ||
-          Boolean(remainingLockupTime),
-        toolTip: (() => {
-          if (isDisabledWithdrawals) {
-            return translate('defi.modals.saversVaults.disabledWithdrawTitle')
-          }
-
-          if (remainingLockupTime) {
-            return translate('defi.modals.saversVaults.withdrawLockedTitle', {
-              timeHuman: formatSecondsToDuration(remainingLockupTime),
-            })
-          }
-
-          if (hasPendingTxs || hasPendingQueries) {
-            return translate('defi.modals.saversVaults.cannotWithdrawWhilePendingTx')
-          }
-        })(),
-      },
-    ],
-    [translate],
-  )
-
-  const menu: DefiButtonProps[] = useMemo(() => {
-    if (!earnOpportunityData) return []
-
-    return makeDefaultMenu({
-      isFull: opportunityMetadata?.isFull || isHardCapReached,
-      hasPendingTxs,
-      hasPendingQueries,
-      isHaltedDeposits: isTradingActive === false,
-      isDisabledDeposits:
-        (!isRunePool && isThorchainSaversDepositEnabled === false) ||
-        (isRunePool && !isRunePoolDepositEnabled),
-      isDisabledWithdrawals:
-        (!isRunePool && isThorchainSaversWithdrawalsEnabled === false) ||
-        (isRunePool && !isRunepoolWithdrawEnabled),
-      remainingLockupTime,
-    })
-  }, [
-    earnOpportunityData,
-    hasPendingQueries,
-    hasPendingTxs,
-    isHardCapReached,
-    isRunePool,
-    isRunePoolDepositEnabled,
-    isRunepoolWithdrawEnabled,
-    isThorchainSaversDepositEnabled,
-    isThorchainSaversWithdrawalsEnabled,
-    isTradingActive,
-    makeDefaultMenu,
-    opportunityMetadata?.isFull,
-    remainingLockupTime,
-  ])
-
-  const poolAlert = useMemo(() => {
-    if (!isLendingActive && !isRunePool && !isMimirLoading) {
-      return (
-        <Alert status='warning' variant='subtle'>
-          <AlertIcon />
-          <AlertDescription>{translate('lending.haltedAlert')}</AlertDescription>
-        </Alert>
-      )
-    }
-
-    if (isHardCapReached || bnOrZero(currentCapFillPercentage).eq(100)) {
-      return (
-        <Alert status='warning' flexDir='column' bg={alertBg} py={4}>
-          <AlertIcon />
-          <AlertTitle>{translate('defi.modals.saversVaults.haltedDepositTitle')}</AlertTitle>
-          <>
-            <AlertDescription>
-              {translate('defi.modals.saversVaults.haltedDescription')}
-            </AlertDescription>
-            <Button
-              as={Link}
-              href={`https://twitter.com/intent/tweet?text=Hey%20%40THORChain%20%23raisethecaps%20already%20so%20I%20can%20deposit%20%23${underlyingAsset?.symbol}%20into%20a%20savers%20vault%20at%20%40ShapeShift`}
-              isExternal
-              mt={4}
-              colorScheme='twitter'
-              rightIcon={faTwitterIcon}
-            >
-              @THORChain
-            </Button>
-          </>
-        </Alert>
-      )
-    }
-
-    return (
-      <Progress
-        value={currentCapFillPercentage}
-        size='sm'
-        borderRadius='md'
-        colorScheme={bnOrZero(currentCapFillPercentage).lt(100) ? 'green' : 'red'}
-      />
-    )
-  }, [
-    translate,
-    alertBg,
-    underlyingAsset?.symbol,
-    currentCapFillPercentage,
-    isHardCapReached,
-    isRunePool,
-    isLendingActive,
-    isMimirLoading,
-  ])
-
-  const renderVaultCap = useMemo(() => {
-    return (
-      <Flex direction='column' gap={2}>
-        <Flex justifyContent='space-between' alignItems='center'>
-          <HelperTooltip label={translate('defi.modals.saversVaults.vaultCapTooltip')}>
-            <Text fontWeight='medium' translation='defi.modals.saversVaults.vaultCap' />
-          </HelperTooltip>
-          <Flex gap={1}>
-            <Amount.Fiat value={opportunityMetadata?.tvl ?? 0} />
-            {opportunityMetadata?.saversMaxSupplyFiat !== undefined ? (
-              <Amount.Fiat
-                value={opportunityMetadata.saversMaxSupplyFiat ?? 0}
-                prefix='/'
-                color='text.subtle'
-              />
-            ) : null}
-          </Flex>
-        </Flex>
-
-        {poolAlert}
-      </Flex>
-    )
-  }, [opportunityMetadata?.saversMaxSupplyFiat, opportunityMetadata?.tvl, translate, poolAlert])
-
-  const description = useMemo(
-    () => ({
-      description: translate(
-        isRunePool
-          ? 'defi.modals.saversVaults.runePoolOverviewDescription'
-          : 'defi.modals.saversVaults.description',
-        {
-          asset: underlyingAsset?.symbol ?? '',
-        },
-      ),
-      isLoaded: isRunePool || !!underlyingAsset?.symbol,
-      isTrustedDescription: true,
-    }),
-    [translate, underlyingAsset?.symbol, isRunePool],
-  )
-
-  const handleThorchainSaversEmptyClick = useCallback(() => setHideEmptyState(true), [])
-
-  if (!earnOpportunityData?.isLoaded || isTradingActiveLoading || isMockDepositQuoteLoading) {
-    return (
-      <Center minW='500px' minH='350px'>
-        <CircularProgress />
-      </Center>
-    )
-  }
-
-  if (bnOrZero(underlyingAssetsFiatBalanceCryptoPrecision).eq(0) && !hideEmptyState) {
-    return <ThorchainSaversEmpty assetId={assetId} onClick={handleThorchainSaversEmptyClick} />
-  }
-
-  if (!asset) return null
-  if (!underlyingAssetsWithBalancesAndIcons) return null
-  if (!earnOpportunityData) return null
-
-  return (
-    <Overview
-      accountId={maybeAccountId}
-      onAccountIdChange={handleAccountIdChange}
-      positionAddress={fromAddress}
-      asset={asset}
-      name={earnOpportunityData.name ?? ''}
-      opportunityFiatBalance={underlyingAssetsFiatBalanceCryptoPrecision}
-      underlyingAssetsCryptoPrecision={underlyingAssetsWithBalancesAndIcons}
-      provider={makeDefiProviderDisplayName({
-        provider: earnOpportunityData.provider,
-        assetName: asset.name,
-      })}
-      description={description}
-      tvl={bnOrZero(earnOpportunityData.tvl).toFixed(2)}
-      apy={earnOpportunityData.apy}
-      menu={menu}
-      postChildren={
-        bnOrZero(opportunityMetadata?.saversMaxSupplyFiat).gt(0) ? renderVaultCap : null
-      }
-    />
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawCommon.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawCommon.ts
deleted file mode 100644
index b950820dd36..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawCommon.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import type { WithdrawValues } from '@/features/defi/components/Withdraw/Withdraw'
-import type { StakingEarnOpportunityType } from '@/state/slices/opportunitiesSlice/types'
-
-type EstimatedGas = {
-  estimatedGasCryptoBaseUnit?: string
-}
-
-type ThorchainSaversWithdrawValues = WithdrawValues &
-  EstimatedGas & {
-    txStatus: string
-    dustAmountCryptoBaseUnit: string
-    networkFeeCryptoBaseUnit: string
-    protocolFeeCryptoBaseUnit: string
-    maybeFromUTXOAccountAddress: string
-  }
-
-export type ThorchainSaversWithdrawState = {
-  opportunity: StakingEarnOpportunityType | null
-  approve: EstimatedGas
-  withdraw: ThorchainSaversWithdrawValues
-  loading: boolean
-  txid: string | null
-  isExactAllowance?: boolean
-}
-
-export enum ThorchainSaversWithdrawActionType {
-  SET_APPROVE = 'SET_APPROVE',
-  SET_IS_EXACT_ALLOWANCE = 'SET_IS_EXACT_ALLOWANCE',
-  SET_OPPORTUNITY = 'SET_OPPORTUNITY',
-  SET_WITHDRAW = 'SET_WITHDRAW',
-  SET_LOADING = 'SET_LOADING',
-  SET_TXID = 'SET_TXID',
-  SET_TX_STATUS = 'SET_TX_STATUS',
-}
-
-type SetOpportunityAction = {
-  type: ThorchainSaversWithdrawActionType.SET_OPPORTUNITY
-  payload: StakingEarnOpportunityType
-}
-
-type SetApprove = {
-  type: ThorchainSaversWithdrawActionType.SET_APPROVE
-  payload: EstimatedGas
-}
-
-type SetIsExactAllowance = {
-  type: ThorchainSaversWithdrawActionType.SET_IS_EXACT_ALLOWANCE
-  payload: boolean
-}
-
-type SetWithdraw = {
-  type: ThorchainSaversWithdrawActionType.SET_WITHDRAW
-  payload: Partial<ThorchainSaversWithdrawValues>
-}
-
-type SetLoading = {
-  type: ThorchainSaversWithdrawActionType.SET_LOADING
-  payload: boolean
-}
-
-type SetTxid = {
-  type: ThorchainSaversWithdrawActionType.SET_TXID
-  payload: string
-}
-
-export type ThorchainSaversWithdrawActions =
-  | SetOpportunityAction
-  | SetWithdraw
-  | SetLoading
-  | SetTxid
-  | SetApprove
-  | SetIsExactAllowance
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawContext.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawContext.ts
deleted file mode 100644
index 56d4a34f334..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawContext.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createContext } from 'react'
-
-import type { ThorchainSaversWithdrawActions, ThorchainSaversWithdrawState } from './WithdrawCommon'
-
-interface IWithdrawContext {
-  state: ThorchainSaversWithdrawState | null
-  dispatch: React.Dispatch<ThorchainSaversWithdrawActions> | null
-}
-
-export const WithdrawContext = createContext<IWithdrawContext>({ state: null, dispatch: null })
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawReducer.ts b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawReducer.ts
deleted file mode 100644
index f26f2b0ece5..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/WithdrawReducer.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { ThorchainSaversWithdrawActions, ThorchainSaversWithdrawState } from './WithdrawCommon'
-import { ThorchainSaversWithdrawActionType } from './WithdrawCommon'
-
-export const initialState: ThorchainSaversWithdrawState = {
-  txid: null,
-  opportunity: null,
-  loading: false,
-  approve: {},
-  isExactAllowance: false,
-  withdraw: {
-    fiatAmount: '',
-    cryptoAmount: '',
-    slippage: '',
-    txStatus: 'pending',
-    dustAmountCryptoBaseUnit: '',
-    protocolFeeCryptoBaseUnit: '',
-    networkFeeCryptoBaseUnit: '',
-    maybeFromUTXOAccountAddress: '',
-  },
-}
-
-export const reducer = (
-  state: ThorchainSaversWithdrawState,
-  action: ThorchainSaversWithdrawActions,
-): ThorchainSaversWithdrawState => {
-  switch (action.type) {
-    case ThorchainSaversWithdrawActionType.SET_IS_EXACT_ALLOWANCE:
-      return { ...state, isExactAllowance: action.payload }
-    case ThorchainSaversWithdrawActionType.SET_APPROVE:
-      return { ...state, approve: action.payload }
-    case ThorchainSaversWithdrawActionType.SET_OPPORTUNITY:
-      return { ...state, opportunity: { ...state.opportunity, ...action.payload } }
-    case ThorchainSaversWithdrawActionType.SET_WITHDRAW:
-      return { ...state, withdraw: { ...state.withdraw, ...action.payload } }
-    case ThorchainSaversWithdrawActionType.SET_LOADING:
-      return { ...state, loading: action.payload }
-    case ThorchainSaversWithdrawActionType.SET_TXID:
-      return { ...state, txid: action.payload }
-    default:
-      return state
-  }
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx
deleted file mode 100644
index 634284faf22..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx
+++ /dev/null
@@ -1,658 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  AlertTitle,
-  Box,
-  Flex,
-  Skeleton,
-  Stack,
-  useToast,
-} from '@chakra-ui/react'
-import type { AccountId } from '@shapeshiftoss/caip'
-import { bchChainId, fromAccountId, thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import { supportsETH } from '@shapeshiftoss/hdwallet-core/wallet'
-import { SwapperName } from '@shapeshiftoss/swapper'
-import { BigAmount } from '@shapeshiftoss/utils'
-import dayjs from 'dayjs'
-import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-
-import { ThorchainSaversWithdrawActionType } from '../WithdrawCommon'
-import { WithdrawContext } from '../WithdrawContext'
-
-import { Amount } from '@/components/Amount/Amount'
-import { AssetIcon } from '@/components/AssetIcon'
-import type { StepComponentProps } from '@/components/DeFi/components/Steps'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Row } from '@/components/Row/Row'
-import { RawText, Text } from '@/components/Text'
-import type { TextPropTypes } from '@/components/Text/Text'
-import { getChainAdapterManager } from '@/context/PluginProvider/chainAdapterSingleton'
-import { Confirm as ReusableConfirm } from '@/features/defi/components/Confirm/Confirm'
-import { Summary } from '@/features/defi/components/Summary'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useIsSmartContractAddress } from '@/hooks/useIsSmartContractAddress/useIsSmartContractAddress'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { BigNumber, bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { fromThorBaseUnit, toThorBaseUnit } from '@/lib/utils/thorchain'
-import { BASE_BPS_POINTS } from '@/lib/utils/thorchain/constants'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
-import type { ThorchainSaversWithdrawQuoteResponseSuccess } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import {
-  getThorchainSaversPosition,
-  getThorchainSaversWithdrawQuote,
-  getWithdrawBps,
-} from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
-import {
-  selectAssetById,
-  selectAssets,
-  selectBip44ParamsByAccountId,
-  selectEarnUserStakingOpportunityByUserStakingId,
-  selectFeeAssetById,
-  selectHighestStakingBalanceAccountIdByStakingId,
-  selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioCryptoBalanceByFilter,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type ConfirmProps = { accountId: AccountId | undefined } & StepComponentProps
-
-export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
-  const [quoteLoading, setQuoteLoading] = useState(false)
-  const [quote, setQuote] = useState<ThorchainSaversWithdrawQuoteResponseSuccess | null>(null)
-  const [expiry, setExpiry] = useState<string>('')
-  const [fromAddress, setfromAddress] = useState<string | null>(null)
-  const [protocolFeeCryptoBaseUnit, setProtocolFeeCryptoBaseUnit] = useState<string>('')
-  const [dustAmountCryptoBaseUnit, setDustAmountCryptoBaseUnit] = useState<string>('')
-  const [slippageCryptoAmountPrecision, setSlippageCryptoAmountPrecision] = useState<string | null>(
-    null,
-  )
-  const { state, dispatch: contextDispatch } = useContext(WithdrawContext)
-  const translate = useTranslate()
-  const mixpanel = getMixPanel()
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const { chainId, assetNamespace, assetReference } = query
-  const opportunity = state?.opportunity
-  const chainAdapter = getChainAdapterManager().get(chainId)
-  const assets = useAppSelector(selectAssets)
-
-  // Asset info
-  const assetId = toAssetId({
-    chainId,
-    assetNamespace,
-    assetReference,
-  })
-
-  const isRunePool = assetId === thorchainAssetId
-
-  const opportunityId = useMemo(
-    () => toOpportunityId({ chainId, assetNamespace, assetReference }),
-    [assetNamespace, assetReference, chainId],
-  )
-  const highestBalanceAccountIdFilter = useMemo(
-    () => ({ stakingId: opportunityId }),
-    [opportunityId],
-  )
-
-  const highestBalanceAccountId = useAppSelector(state =>
-    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
-  )
-  const opportunityDataFilter = useMemo(() => {
-    const _accountId = accountId ?? highestBalanceAccountId
-    if (!_accountId) return
-
-    return {
-      userStakingId: serializeUserStakingId(
-        _accountId,
-        toOpportunityId({
-          chainId,
-          assetNamespace,
-          assetReference,
-        }),
-      ),
-    }
-  }, [accountId, assetNamespace, assetReference, chainId, highestBalanceAccountId])
-
-  const opportunityData = useAppSelector(state =>
-    opportunityDataFilter
-      ? selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter)
-      : undefined,
-  )
-
-  const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
-  const marketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId ?? ''),
-  )
-  const feeMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
-  )
-
-  const accountFilter = useMemo(() => ({ accountId }), [accountId])
-  const bip44Params = useAppSelector(state => selectBip44ParamsByAccountId(state, accountFilter))
-  const userAddress = useMemo(
-    () => (accountId ? fromAccountId(accountId).account : ''),
-    [accountId],
-  )
-
-  if (!asset) throw new Error(`Asset not found for AssetId ${opportunityData?.assetId}`)
-  if (!feeAsset) throw new Error(`Fee asset not found for AssetId ${assetId}`)
-
-  // user info
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const feeAssetBalanceFilter = useMemo(
-    () => ({ assetId: feeAsset?.assetId, accountId }),
-    [accountId, feeAsset?.assetId],
-  )
-  //
-  const feeAssetBalance = useAppSelector(s =>
-    selectPortfolioCryptoBalanceByFilter(s, feeAssetBalanceFilter),
-  )
-
-  // notify
-  const toast = useToast()
-
-  useEffect(() => {
-    ;(async () => {
-      try {
-        if (isRunePool) return
-        if (!(accountId && opportunityData?.stakedAmountCryptoBaseUnit && asset)) return
-        // This effects sets these three state fields, so if we already have them, this is a no-op
-        if (dustAmountCryptoBaseUnit && protocolFeeCryptoBaseUnit && expiry) return
-        setQuoteLoading(true)
-
-        const amountCryptoBaseUnit = BigAmount.fromPrecision({
-          value: state?.withdraw.cryptoAmount,
-          precision: asset.precision,
-        }).toBaseUnit()
-        if (bn(amountCryptoBaseUnit).isZero()) return
-
-        const amountCryptoThorBaseUnit = toThorBaseUnit({
-          valueCryptoBaseUnit: amountCryptoBaseUnit,
-          asset,
-        })
-
-        const withdrawBps = getWithdrawBps({
-          withdrawAmountCryptoBaseUnit: amountCryptoBaseUnit,
-          stakedAmountCryptoBaseUnit: opportunityData.stakedAmountCryptoBaseUnit,
-          rewardsAmountCryptoBaseUnit: opportunityData?.rewardsCryptoBaseUnit?.amounts[0] ?? '0',
-        })
-
-        if (bn(withdrawBps).isZero()) return
-
-        const maybeQuote = await getThorchainSaversWithdrawQuote({
-          asset,
-          accountId,
-          bps: withdrawBps,
-        })
-
-        if (maybeQuote.isErr()) throw new Error(maybeQuote.unwrapErr())
-        const _quote = maybeQuote.unwrap()
-        setQuote(_quote)
-
-        const {
-          expiry: _expiry,
-          dust_amount,
-          expected_amount_out,
-          fees: { slippage_bps },
-        } = _quote
-
-        setExpiry(_expiry)
-
-        const protocolFeeCryptoThorBaseUnit = amountCryptoThorBaseUnit.minus(expected_amount_out)
-        setProtocolFeeCryptoBaseUnit(
-          BigAmount.fromPrecision({
-            value: fromThorBaseUnit(protocolFeeCryptoThorBaseUnit),
-            precision: asset.precision,
-          }).toBaseUnit(),
-        )
-        setDustAmountCryptoBaseUnit(
-          bnOrZero(
-            BigAmount.fromPrecision({
-              value: fromThorBaseUnit(dust_amount),
-              precision: feeAsset.precision,
-            }).toBaseUnit(),
-          ).toFixed(),
-        )
-        const percentage = bnOrZero(slippage_bps).div(BASE_BPS_POINTS).times(100)
-        // total downside (slippage going into position) - 0.007 ETH for 5 ETH deposit
-        const cryptoSlippageAmountPrecision = bnOrZero(state?.withdraw.cryptoAmount)
-          .times(percentage)
-          .div(100)
-        setSlippageCryptoAmountPrecision(cryptoSlippageAmountPrecision.toString())
-      } catch (e) {
-        console.error(e)
-      } finally {
-        setQuoteLoading(false)
-      }
-    })()
-  }, [
-    accountId,
-    asset,
-    dustAmountCryptoBaseUnit,
-    feeAsset,
-    opportunity?.apy,
-    opportunityData?.rewardsCryptoBaseUnit,
-    opportunityData?.stakedAmountCryptoBaseUnit,
-    state?.withdraw.cryptoAmount,
-    protocolFeeCryptoBaseUnit,
-    expiry,
-    isRunePool,
-  ])
-
-  useEffect(() => {
-    ;(async () => {
-      if (fromAddress || !accountId) return
-
-      try {
-        const position = await getThorchainSaversPosition({ accountId, assetId })
-        if (!position) return ''
-        const { asset_address } = position
-        const accountAddress =
-          chainId === bchChainId ? `bitcoincash:${asset_address}` : asset_address
-
-        setfromAddress(accountAddress)
-      } catch (_e) {
-        throw new Error(`Cannot get savers position for accountId: ${accountId}`)
-      }
-    })()
-  }, [accountId, assetId, chainId, fromAddress])
-
-  const memo = useMemo(() => {
-    if (quote?.memo) return quote.memo
-
-    if (isRunePool && state && opportunityData?.stakedAmountCryptoBaseUnit) {
-      const amountCryptoBaseUnit = BigAmount.fromPrecision({
-        value: state?.withdraw.cryptoAmount,
-        precision: asset.precision,
-      }).toBaseUnit()
-      const withdrawBps = getWithdrawBps({
-        withdrawAmountCryptoBaseUnit: amountCryptoBaseUnit,
-        stakedAmountCryptoBaseUnit: opportunityData.stakedAmountCryptoBaseUnit,
-        rewardsAmountCryptoBaseUnit: opportunityData?.rewardsCryptoBaseUnit?.amounts[0] ?? '0',
-      })
-
-      return `pool-:${withdrawBps}`
-    }
-
-    return null
-  }, [isRunePool, quote, state, opportunityData, asset.precision])
-
-  const { executeTransaction, estimatedFeesData } = useSendThorTx({
-    accountId: accountId ?? null,
-    assetId,
-    // withdraw savers will use dust amount
-    amountCryptoBaseUnit: null,
-    action: isRunePool ? 'withdrawRunepool' : 'withdrawSavers',
-    memo,
-    fromAddress,
-    dustAmountCryptoBaseUnit,
-  })
-
-  const estimatedGasCryptoPrecision = useMemo(() => {
-    if (!estimatedFeesData) return
-    return BigAmount.fromBaseUnit({
-      value: estimatedFeesData.txFeeCryptoBaseUnit,
-      precision: feeAsset.precision,
-    }).toPrecision()
-  }, [estimatedFeesData, feeAsset.precision])
-
-  useEffect(() => {
-    if (!estimatedFeesData || !contextDispatch) return
-
-    contextDispatch({
-      type: ThorchainSaversWithdrawActionType.SET_WITHDRAW,
-      payload: {
-        estimatedGasCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-        networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-      },
-    })
-  }, [contextDispatch, estimatedFeesData])
-
-  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
-    assetId,
-    swapperName: SwapperName.Thorchain,
-  })
-
-  const handleConfirm = useCallback(async () => {
-    if (!isRunePool && !expiry) return
-    if (!contextDispatch || !bip44Params || !accountId || !assetId || !opportunityData) return
-    try {
-      if (
-        !(
-          userAddress &&
-          assetReference &&
-          wallet &&
-          supportsETH(wallet) &&
-          opportunity &&
-          chainAdapter
-        )
-      )
-        return
-
-      contextDispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: true })
-      if (!state?.withdraw.cryptoAmount) return
-
-      if (!isRunePool && dayjs().isAfter(dayjs.unix(Number(expiry)))) {
-        toast({
-          position: 'top-right',
-          description: translate('trade.errors.quoteExpired'),
-          title: translate('common.transactionFailed'),
-          status: 'error',
-        })
-        onNext(DefiStep.Info)
-        return
-      }
-
-      // Was the pool active when it was fetched at the time of the component mount
-      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
-      if (isTradingActive === false) {
-        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
-      }
-
-      // Refetch the trading active state JIT to ensure the pool didn't just become halted
-      const _isTradingActive = await refetchIsTradingActive()
-      if (_isTradingActive === false) {
-        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
-      }
-
-      const _txId = await executeTransaction()
-      if (!_txId) throw new Error('No txId returned from onSignTx')
-
-      contextDispatch({ type: ThorchainSaversWithdrawActionType.SET_TXID, payload: _txId })
-      contextDispatch({
-        type: ThorchainSaversWithdrawActionType.SET_WITHDRAW,
-        payload: {
-          dustAmountCryptoBaseUnit,
-          protocolFeeCryptoBaseUnit,
-          maybeFromUTXOAccountAddress: fromAddress ?? '',
-        },
-      })
-      onNext(DefiStep.Status)
-      trackOpportunityEvent(
-        MixPanelEvent.WithdrawConfirm,
-        {
-          opportunity: opportunityData,
-          fiatAmounts: [state.withdraw.fiatAmount],
-          cryptoAmounts: [{ assetId, amountCryptoPrecision: state.withdraw.cryptoAmount }],
-        },
-        assets,
-      )
-    } catch (error) {
-      console.error(error)
-      toast({
-        position: 'top-right',
-        description: translate('common.transactionFailedBody'),
-        title: translate('common.transactionFailed'),
-        status: 'error',
-      })
-    } finally {
-      contextDispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: false })
-    }
-  }, [
-    contextDispatch,
-    bip44Params,
-    accountId,
-    assetId,
-    opportunityData,
-    expiry,
-    userAddress,
-    assetReference,
-    wallet,
-    opportunity,
-    chainAdapter,
-    fromAddress,
-    state?.withdraw.cryptoAmount,
-    state?.withdraw.fiatAmount,
-    isTradingActive,
-    refetchIsTradingActive,
-    executeTransaction,
-    dustAmountCryptoBaseUnit,
-    protocolFeeCryptoBaseUnit,
-    onNext,
-    assets,
-    toast,
-    translate,
-    isRunePool,
-  ])
-
-  const handleCancel = useCallback(() => {
-    onNext(DefiStep.Info)
-  }, [onNext])
-
-  const missingBalanceForGasCryptoPrecision = useMemo(() => {
-    return feeAssetBalance
-      .minus(
-        BigAmount.fromBaseUnit({
-          value: bnOrZero(state?.withdraw.estimatedGasCryptoBaseUnit).toFixed(),
-          precision: feeAsset.precision,
-        }),
-      )
-      .minus(
-        BigAmount.fromBaseUnit({
-          value: bnOrZero(dustAmountCryptoBaseUnit).toFixed(),
-          precision: feeAsset.precision,
-        }),
-      )
-      .negated()
-      .toPrecision()
-  }, [
-    state?.withdraw.estimatedGasCryptoBaseUnit,
-    dustAmountCryptoBaseUnit,
-    feeAssetBalance,
-    feeAsset.precision,
-  ])
-
-  const hasEnoughBalanceForGas = useMemo(
-    () => bn(missingBalanceForGasCryptoPrecision).lte(0),
-    [missingBalanceForGasCryptoPrecision],
-  )
-
-  useEffect(() => {
-    if (!hasEnoughBalanceForGas) {
-      mixpanel?.track(MixPanelEvent.InsufficientFunds)
-    }
-  }, [hasEnoughBalanceForGas, mixpanel])
-
-  const missingFundsForGasTranslation: TextPropTypes['translation'] = useMemo(
-    () => [
-      'modals.confirm.missingFundsForGas',
-      {
-        cryptoAmountHuman: bn(missingBalanceForGasCryptoPrecision).toFixed(6, BigNumber.ROUND_UP),
-        assetSymbol: feeAsset.symbol,
-      },
-    ],
-    [missingBalanceForGasCryptoPrecision, feeAsset.symbol],
-  )
-
-  const { data: _isSmartContractAddress, isLoading: isAddressByteCodeLoading } =
-    useIsSmartContractAddress(userAddress, chainId)
-
-  const disableSmartContractWithdraw = useMemo(() => {
-    // This is either a smart contract address, or the bytecode is still loading - disable confirm
-    if (_isSmartContractAddress) return true
-
-    // All checks passed - this is an EOA address
-    return false
-  }, [_isSmartContractAddress])
-
-  const preFooter = useMemo(() => {
-    if (!_isSmartContractAddress) return null
-
-    return (
-      <Flex direction='column' gap={2}>
-        <Alert status='error' width='auto' fontSize='sm'>
-          <AlertIcon />
-          <Stack spacing={0}>
-            <AlertTitle>{translate('trade.errors.smartContractWalletNotSupported')}</AlertTitle>
-            <AlertDescription lineHeight='short'>
-              {translate('trade.thorSmartContractWalletUnsupported')}
-            </AlertDescription>
-          </Stack>
-        </Alert>
-      </Flex>
-    )
-  }, [_isSmartContractAddress, translate])
-
-  const canWithdraw = useMemo(() => {
-    const amountCryptoBaseUnit = BigAmount.fromPrecision({
-      value: state?.withdraw.cryptoAmount,
-      precision: asset.precision,
-    }).toBaseUnit()
-
-    // RUNEPool withdraws occur no explicit protocol fees, see https://viewblock.io/thorchain/tx/8C8DA9D44AAE7C042F38393B8E42AEF6DB9BAFF09D3A702991C35CBA215AD576
-    return bnOrZero(amountCryptoBaseUnit).gte(isRunePool ? 0 : protocolFeeCryptoBaseUnit)
-  }, [state?.withdraw.cryptoAmount, asset.precision, protocolFeeCryptoBaseUnit, isRunePool])
-
-  if (!state || !contextDispatch) return null
-
-  return (
-    <ReusableConfirm
-      onCancel={handleCancel}
-      preFooter={preFooter}
-      headerText='modals.confirm.withdraw.header'
-      isDisabled={
-        (!expiry && !isRunePool) ||
-        !hasEnoughBalanceForGas ||
-        !userAddress ||
-        disableSmartContractWithdraw ||
-        !canWithdraw ||
-        isTradingActive === false
-      }
-      loading={quoteLoading || state.loading || !userAddress || isAddressByteCodeLoading}
-      loadingText={translate('common.confirm')}
-      onConfirm={handleConfirm}
-    >
-      <Summary>
-        <Row variant='vertical' p={4}>
-          <Row.Label>
-            <Text translation='modals.confirm.amountToWithdraw' />
-          </Row.Label>
-          <Row px={0} fontWeight='medium'>
-            <Stack direction='row' alignItems='center'>
-              <AssetIcon size='xs' src={asset.icon} />
-              <RawText>{asset.name}</RawText>
-            </Stack>
-            <Row.Value>
-              <Amount.Crypto value={state.withdraw.cryptoAmount} symbol={asset.symbol} />
-            </Row.Value>
-          </Row>
-        </Row>
-        {!isRunePool ? (
-          <Row variant='gutter'>
-            <Row.Label>{translate('common.slippage')}</Row.Label>
-            <Row.Value>
-              <Amount.Crypto value={slippageCryptoAmountPrecision ?? ''} symbol={asset.symbol} />
-            </Row.Value>
-          </Row>
-        ) : null}
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.protocolFee')}>
-              <Text translation='trade.protocolFee' />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Box textAlign='right'>
-              <Skeleton isLoaded={!quoteLoading}>
-                <Amount.Fiat
-                  fontWeight='bold'
-                  value={BigAmount.fromBaseUnit({
-                    value: protocolFeeCryptoBaseUnit,
-                    precision: asset.precision,
-                  })
-                    .times(marketData?.price)
-                    .toPrecision()}
-                />
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={BigAmount.fromBaseUnit({
-                    value: protocolFeeCryptoBaseUnit,
-                    precision: asset.precision,
-                  }).toPrecision()}
-                  symbol={asset.symbol}
-                />
-              </Skeleton>
-            </Box>
-          </Row.Value>
-        </Row>
-        <Row variant='gutter'>
-          <Row.Label>
-            <HelperTooltip label={translate('trade.tooltip.minerFee')}>
-              <Text translation='trade.minerFee' />
-            </HelperTooltip>
-          </Row.Label>
-          <Row.Value>
-            <Box textAlign='right'>
-              <Skeleton isLoaded={!quoteLoading}>
-                <Amount.Fiat
-                  fontWeight='bold'
-                  value={bnOrZero(estimatedGasCryptoPrecision)
-                    .times(bnOrZero(feeMarketData?.price))
-                    .toFixed()}
-                />
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={estimatedGasCryptoPrecision ?? '0'}
-                  symbol={feeAsset.symbol}
-                />
-              </Skeleton>
-            </Box>
-          </Row.Value>
-        </Row>
-        {!isRunePool && (
-          <Row variant='gutter'>
-            <Row.Label>
-              <HelperTooltip label={translate('defi.modals.saversVaults.dustAmountTooltip')}>
-                <Text translation='defi.modals.saversVaults.dustAmount' />
-              </HelperTooltip>
-            </Row.Label>
-            <Row.Value>
-              <Box textAlign='right'>
-                <Skeleton isLoaded={!quoteLoading}>
-                  <Amount.Fiat
-                    fontWeight='bold'
-                    value={BigAmount.fromBaseUnit({
-                      value: dustAmountCryptoBaseUnit,
-                      precision: feeAsset.precision,
-                    })
-                      .times(feeMarketData?.price)
-                      .toFixed(2)}
-                  />
-                  <Amount.Crypto
-                    color='text.subtle'
-                    value={BigAmount.fromBaseUnit({
-                      value: dustAmountCryptoBaseUnit,
-                      precision: feeAsset.precision,
-                    }).toPrecision()}
-                    symbol={feeAsset.symbol}
-                  />
-                </Skeleton>
-              </Box>
-            </Row.Value>
-          </Row>
-        )}
-        {!hasEnoughBalanceForGas && (
-          <Alert status='error' borderRadius='lg'>
-            <AlertIcon />
-            <Text translation={missingFundsForGasTranslation} />
-          </Alert>
-        )}
-      </Summary>
-    </ReusableConfirm>
-  )
-}
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx
deleted file mode 100644
index 8d32c2ad4a6..00000000000
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx
+++ /dev/null
@@ -1,666 +0,0 @@
-import { Alert, AlertIcon, Skeleton } from '@chakra-ui/react'
-import type { AccountId } from '@shapeshiftoss/caip'
-import { thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { BigAmount, convertPercentageToBasisPoints } from '@shapeshiftoss/utils'
-import type { Result } from '@sniptt/monads'
-import { Err, Ok } from '@sniptt/monads'
-import { useQueryClient } from '@tanstack/react-query'
-import pDebounce from 'p-debounce'
-import { useCallback, useContext, useMemo, useState } from 'react'
-import { FormProvider, useForm, useWatch } from 'react-hook-form'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import { ThorchainSaversWithdrawActionType } from '../WithdrawCommon'
-import { WithdrawContext } from '../WithdrawContext'
-
-import { Amount } from '@/components/Amount/Amount'
-import type { StepComponentProps } from '@/components/DeFi/components/Steps'
-import { Row } from '@/components/Row/Row'
-import { Text } from '@/components/Text'
-import type { TextPropTypes } from '@/components/Text/Text'
-import type { WithdrawValues } from '@/features/defi/components/Withdraw/Withdraw'
-import { Field, Withdraw as ReusableWithdraw } from '@/features/defi/components/Withdraw/Withdraw'
-import type {
-  DefiParams,
-  DefiQueryParams,
-} from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { DefiStep } from '@/features/defi/contexts/DefiManagerProvider/DefiCommon'
-import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
-import { useNotificationToast } from '@/hooks/useNotificationToast'
-import { BigNumber, bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { trackOpportunityEvent } from '@/lib/mixpanel/helpers'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { fetchHasEnoughBalanceForTxPlusFeesPlusSweep } from '@/lib/utils/thorchain/balance'
-import { BASE_BPS_POINTS } from '@/lib/utils/thorchain/constants'
-import type { GetThorchainSaversWithdrawQuoteQueryKey } from '@/lib/utils/thorchain/hooks/useGetThorchainSaversWithdrawQuoteQuery'
-import {
-  fetchThorchainWithdrawQuote,
-  useGetThorchainSaversWithdrawQuoteQuery,
-} from '@/lib/utils/thorchain/hooks/useGetThorchainSaversWithdrawQuoteQuery'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import { isUtxoChainId } from '@/lib/utils/utxo'
-import { useIsSweepNeededQuery } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import type { ThorchainSaversWithdrawQuoteResponseSuccess } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
-import {
-  selectAssetById,
-  selectAssets,
-  selectEarnUserStakingOpportunityByUserStakingId,
-  selectFeeAssetById,
-  selectHighestStakingBalanceAccountIdByStakingId,
-  selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioCryptoBalanceByFilter,
-} from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type WithdrawProps = StepComponentProps & {
-  accountId: AccountId | undefined
-  fromAddress: string | undefined
-}
-
-const percentOptions = [0.25, 0.5, 0.75, 1]
-
-export const Withdraw: React.FC<WithdrawProps> = ({ accountId, fromAddress, onNext }) => {
-  const [slippageCryptoAmountPrecision, setSlippageCryptoAmountPrecision] = useState<string>()
-  const [missingFunds, setMissingFunds] = useState<string | null>(null)
-  const [quoteLoading, setQuoteLoading] = useState(false)
-  const { state, dispatch } = useContext(WithdrawContext)
-  const translate = useTranslate()
-  const toast = useNotificationToast({ desktopPosition: 'top-right' })
-  const queryClient = useQueryClient()
-  const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
-  const { chainId, assetNamespace, assetReference } = query
-  const navigate = useNavigate()
-
-  const methods = useForm<WithdrawValues>({ mode: 'onChange' })
-  const { control, setValue } = methods
-
-  const cryptoAmount = useWatch<WithdrawValues, Field.CryptoAmount>({
-    control,
-    name: Field.CryptoAmount,
-  })
-
-  const assets = useAppSelector(selectAssets)
-  const assetId = toAssetId({ chainId, assetNamespace, assetReference })
-
-  const isRunePool = assetId === thorchainAssetId
-
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, assetId))
-  const opportunityId = useMemo(
-    () => (assetId ? toOpportunityId({ chainId, assetNamespace, assetReference }) : undefined),
-    [assetId, assetNamespace, assetReference, chainId],
-  )
-
-  const highestBalanceAccountIdFilter = useMemo(
-    () => ({ stakingId: opportunityId }),
-    [opportunityId],
-  )
-  const highestBalanceAccountId = useAppSelector(state =>
-    selectHighestStakingBalanceAccountIdByStakingId(state, highestBalanceAccountIdFilter),
-  )
-
-  const opportunityDataFilter = useMemo(
-    () => ({
-      userStakingId: serializeUserStakingId(
-        accountId ?? highestBalanceAccountId ?? '',
-        opportunityId ?? '',
-      ),
-    }),
-    [accountId, highestBalanceAccountId, opportunityId],
-  )
-
-  const opportunityData = useAppSelector(state =>
-    selectEarnUserStakingOpportunityByUserStakingId(state, opportunityDataFilter),
-  )
-
-  const asset: Asset | undefined = useAppSelector(state => selectAssetById(state, assetId))
-  if (!asset) throw new Error(`Asset not found for AssetId ${assetId}`)
-  if (!feeAsset) throw new Error(`Fee Asset not found for AssetId ${assetId}`)
-
-  // user info
-  const amountAvailableCryptoPrecision = useMemo(() => {
-    const totalBaseUnit = bnOrZero(opportunityData?.stakedAmountCryptoBaseUnit)
-      .plus(bnOrZero(opportunityData?.rewardsCryptoBaseUnit?.amounts[0])) // Savers rewards are denominated in a single asset
-      .toFixed(0)
-    return BigAmount.fromBaseUnit({
-      value: totalBaseUnit,
-      precision: asset.precision,
-    })
-  }, [
-    asset.precision,
-    opportunityData?.rewardsCryptoBaseUnit,
-    opportunityData?.stakedAmountCryptoBaseUnit,
-  ])
-
-  const balanceFilter = useMemo(() => ({ assetId, accountId }), [accountId, assetId])
-  const balanceCryptoBaseUnit = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, balanceFilter),
-  ).toBaseUnit()
-
-  const assetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId),
-  )
-  const feeAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, feeAsset?.assetId ?? ''),
-  )
-
-  const assetPriceInFeeAsset = useMemo(() => {
-    return bnOrZero(assetMarketData?.price).div(bnOrZero(feeAssetMarketData?.price))
-  }, [assetMarketData?.price, feeAssetMarketData?.price])
-
-  const fiatAmountAvailable = useMemo(
-    () => amountAvailableCryptoPrecision.times(assetMarketData?.price),
-    [amountAvailableCryptoPrecision, assetMarketData?.price],
-  )
-
-  // TODO(gomes): this will work for UTXO but is invalid for tokens since they use diff. denoms
-  // the current workaround is to not do fee deduction for non-UTXO chains,
-  // but for consistency, we should for native EVM assets, and ensure this is a no-op for tokens
-  // Note when implementing this, fee checks/deduction will need to either be done for *native* assets only
-  // or handle different denoms for tokens/native assets and display insufficientFundsForProtocolFee copy
-  const getHasEnoughBalanceForTxPlusFees = useCallback(
-    ({
-      balanceCryptoBaseUnit,
-      amountCryptoPrecision,
-      txFeeCryptoBaseUnit,
-      precision,
-    }: {
-      balanceCryptoBaseUnit: string
-      amountCryptoPrecision: string
-      txFeeCryptoBaseUnit: string
-      precision: number
-    }) => {
-      const balanceCryptoBaseUnitBn = bnOrZero(balanceCryptoBaseUnit)
-      if (balanceCryptoBaseUnitBn.isZero()) return false
-
-      return bnOrZero(amountCryptoPrecision)
-        .plus(
-          BigAmount.fromBaseUnit({
-            value: txFeeCryptoBaseUnit,
-            precision: precision ?? 0,
-          }).toPrecision(),
-        )
-        .lte(
-          BigAmount.fromBaseUnit({
-            value: balanceCryptoBaseUnitBn,
-            precision: precision ?? 0,
-          }).toPrecision(),
-        )
-    },
-    [],
-  )
-
-  const hasEnoughStakingBalance = useMemo(
-    () => amountAvailableCryptoPrecision.gte(cryptoAmount),
-    [amountAvailableCryptoPrecision, cryptoAmount],
-  )
-  const { data: thorchainSaversWithdrawQuote, isLoading: isThorchainSaversWithdrawQuoteLoading } =
-    useGetThorchainSaversWithdrawQuoteQuery({
-      asset,
-      accountId,
-      amountCryptoBaseUnit: BigAmount.fromPrecision({
-        value: cryptoAmount,
-        precision: asset.precision,
-      }).toBaseUnit(),
-      enabled: hasEnoughStakingBalance && !isRunePool,
-    })
-
-  const memo = useMemo(() => {
-    if (thorchainSaversWithdrawQuote?.memo) return thorchainSaversWithdrawQuote.memo
-    if (!hasEnoughStakingBalance) return null
-
-    if (isRunePool) {
-      const percent = bnOrZero(cryptoAmount)
-        .div(amountAvailableCryptoPrecision.toPrecision())
-        .times(100)
-        .toFixed(0)
-      const basisPoints = convertPercentageToBasisPoints(percent)
-
-      return `pool-:${basisPoints}`
-    }
-
-    return null
-  }, [
-    isRunePool,
-    thorchainSaversWithdrawQuote,
-    amountAvailableCryptoPrecision,
-    cryptoAmount,
-    hasEnoughStakingBalance,
-  ])
-
-  const {
-    estimatedFeesData,
-    isEstimatedFeesDataLoading,
-    dustAmountCryptoBaseUnit,
-    outboundFeeCryptoBaseUnit,
-  } = useSendThorTx({
-    assetId,
-    accountId: accountId ?? '',
-    // withdraw savers will use dust amount and runepool will use the memo
-    amountCryptoBaseUnit: null,
-    memo,
-    fromAddress: fromAddress ?? null,
-    action: isRunePool ? 'withdrawRunepool' : 'withdrawSavers',
-  })
-
-  const isSweepNeededArgs = useMemo(
-    () => ({
-      assetId,
-      address: fromAddress,
-      amountCryptoBaseUnit: dustAmountCryptoBaseUnit,
-      txFeeCryptoBaseUnit: estimatedFeesData?.txFeeCryptoBaseUnit ?? '0',
-      // Don't fetch sweep needed if there isn't enough balance for the dust amount + fees, since adding in a sweep Tx would obviously fail too
-      enabled: Boolean(
-        estimatedFeesData &&
-          getHasEnoughBalanceForTxPlusFees({
-            precision: asset.precision,
-            balanceCryptoBaseUnit,
-            amountCryptoPrecision: BigAmount.fromBaseUnit({
-              value: dustAmountCryptoBaseUnit,
-              precision: feeAsset.precision,
-            }).toPrecision(),
-            txFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-          }),
-      ),
-    }),
-    [
-      asset.precision,
-      assetId,
-      balanceCryptoBaseUnit,
-      dustAmountCryptoBaseUnit,
-      estimatedFeesData,
-      feeAsset.precision,
-      fromAddress,
-      getHasEnoughBalanceForTxPlusFees,
-    ],
-  )
-
-  const { data: isSweepNeeded, isLoading: isSweepNeededLoading } =
-    useIsSweepNeededQuery(isSweepNeededArgs)
-
-  const handleContinue = useCallback(
-    (formValues: WithdrawValues) => {
-      if (!dispatch || !estimatedFeesData || !opportunityData) return
-
-      // set withdraw state for future use
-      dispatch({ type: ThorchainSaversWithdrawActionType.SET_WITHDRAW, payload: formValues })
-      dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: true })
-
-      try {
-        dispatch({
-          type: ThorchainSaversWithdrawActionType.SET_WITHDRAW,
-          payload: {
-            estimatedGasCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-            networkFeeCryptoBaseUnit: estimatedFeesData.txFeeCryptoBaseUnit,
-          },
-        })
-
-        onNext(isSweepNeeded ? DefiStep.Sweep : DefiStep.Confirm)
-
-        trackOpportunityEvent(
-          MixPanelEvent.WithdrawContinue,
-          {
-            opportunity: opportunityData,
-            fiatAmounts: [formValues.fiatAmount],
-            cryptoAmounts: [{ assetId, amountCryptoPrecision: formValues.cryptoAmount }],
-          },
-          assets,
-        )
-      } catch (error) {
-        console.error(error)
-        toast({
-          description: translate('common.somethingWentWrongBody'),
-          title: translate('common.somethingWentWrong'),
-          status: 'error',
-        })
-      } finally {
-        dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: false })
-      }
-    },
-    [
-      opportunityData,
-      dispatch,
-      onNext,
-      isSweepNeeded,
-      assetId,
-      assets,
-      estimatedFeesData,
-      toast,
-      translate,
-    ],
-  )
-
-  const handleCancel = useCallback(() => {
-    navigate(-1)
-  }, [navigate])
-
-  const handlePercentClick = useCallback(
-    (percent: number) => {
-      const cryptoAmount = amountAvailableCryptoPrecision.times(percent)
-      const fiatAmount = cryptoAmount.times(assetMarketData?.price)
-
-      setValue(Field.FiatAmount, fiatAmount.toPrecision(), { shouldValidate: true })
-      setValue(Field.CryptoAmount, cryptoAmount.toFixed(asset.precision), { shouldValidate: true })
-    },
-    [amountAvailableCryptoPrecision, asset.precision, assetMarketData?.price, setValue],
-  )
-
-  const outboundFeeInAssetCryptoBaseUnit = useMemo(() => {
-    if (!asset) return bn(0)
-    if (!feeAsset) return bn(0)
-    if (!outboundFeeCryptoBaseUnit) return bn(0)
-
-    const outboundFeeCryptoPrecision = BigAmount.fromBaseUnit({
-      value: outboundFeeCryptoBaseUnit,
-      precision: feeAsset.precision,
-    }).toPrecision()
-    const outboundFeeInAssetCryptoPrecision = bn(outboundFeeCryptoPrecision).div(
-      assetPriceInFeeAsset,
-    )
-
-    return BigAmount.fromPrecision({
-      value: outboundFeeInAssetCryptoPrecision,
-      precision: asset.precision,
-    }).toBaseUnit()
-  }, [outboundFeeCryptoBaseUnit, assetPriceInFeeAsset, asset, feeAsset])
-
-  // https://gitlab.com/thorchain/thornode/-/blob/develop/x/thorchain/querier_quotes.go#L467
-  const safeOutboundFeeInAssetCryptoBaseUnit = useMemo(() => {
-    if (!outboundFeeInAssetCryptoBaseUnit) return
-    return bnOrZero(outboundFeeInAssetCryptoBaseUnit).times(4).toFixed(0)
-  }, [outboundFeeInAssetCryptoBaseUnit])
-
-  const _validateCryptoAmount = useCallback(
-    async (value: string) => {
-      if (!accountId) return false
-      if (!opportunityData) return false
-      if (!safeOutboundFeeInAssetCryptoBaseUnit) return false
-
-      try {
-        const withdrawAmountCryptoPrecision = bnOrZero(value)
-        const withdrawAmountCryptoBaseUnit = BigAmount.fromPrecision({
-          value,
-          precision: asset.precision,
-        }).toBaseUnit()
-        const amountCryptoBaseUnit = BigAmount.fromPrecision({
-          value: withdrawAmountCryptoPrecision,
-          precision: asset.precision,
-        }).toBaseUnit()
-
-        if (amountAvailableCryptoPrecision.lt(withdrawAmountCryptoPrecision))
-          return 'common.insufficientFunds'
-
-        setMissingFunds(null)
-        setQuoteLoading(true)
-
-        const thorchainSaversWithdrawQuoteQueryKey: GetThorchainSaversWithdrawQuoteQueryKey = [
-          'thorchainSaversWithdrawQuote',
-          { asset, accountId, amountCryptoBaseUnit },
-        ]
-
-        let slippage_bps = await (async () => {
-          // @TODO: verify if runepool doesn't occur any slippage
-          if (isRunePool) return 0
-
-          const maybeQuote: Result<ThorchainSaversWithdrawQuoteResponseSuccess, string> =
-            await queryClient
-              .fetchQuery({
-                queryKey: thorchainSaversWithdrawQuoteQueryKey,
-                queryFn: () =>
-                  fetchThorchainWithdrawQuote({ asset, accountId, amountCryptoBaseUnit }),
-                staleTime: 5000,
-              })
-              // Re-wrapping into a Result<T, E> since react-query expects promises to reject and doesn't speak monads
-              .then(res => Ok(res))
-              .catch((err: Error) => Err(err.message))
-
-          const quote = maybeQuote.unwrap()
-
-          return quote.fees.slippage_bps
-        })()
-
-        const percentage = bnOrZero(slippage_bps).div(BASE_BPS_POINTS).times(100)
-        // total downside (slippage going into position) - 0.007 ETH for 5 ETH deposit
-        const cryptoSlippageAmountPrecision = withdrawAmountCryptoPrecision
-          .times(percentage)
-          .div(100)
-        setSlippageCryptoAmountPrecision(cryptoSlippageAmountPrecision.toString())
-
-        const hasValidBalance = await (async () => {
-          // Only check for sweep + fees at this stage for UTXOs because of reconciliation - this is *not* required for EVM chains
-          if (!isUtxoChainId(chainId)) {
-            return (
-              amountAvailableCryptoPrecision.gt(0) &&
-              withdrawAmountCryptoPrecision.gt(0) &&
-              amountAvailableCryptoPrecision.gte(withdrawAmountCryptoPrecision)
-            )
-          }
-
-          const { hasEnoughBalance: hasEnoughBalanceForTxPlusFeesPlusSweep, missingFunds } =
-            await fetchHasEnoughBalanceForTxPlusFeesPlusSweep({
-              amountCryptoPrecision: withdrawAmountCryptoPrecision.toFixed(),
-              accountId,
-              asset,
-              type: 'withdraw',
-              fromAddress,
-            })
-
-          if (bnOrZero(missingFunds).gt(0)) setMissingFunds(missingFunds)
-
-          return (
-            amountAvailableCryptoPrecision.gt(0) &&
-            withdrawAmountCryptoPrecision.gt(0) &&
-            hasEnoughBalanceForTxPlusFeesPlusSweep
-          )
-        })()
-
-        const isBelowWithdrawThreshold = bn(withdrawAmountCryptoBaseUnit)
-          .minus(safeOutboundFeeInAssetCryptoBaseUnit)
-          .lt(0)
-
-        if (isBelowWithdrawThreshold) {
-          const minLimitCryptoPrecision = BigAmount.fromBaseUnit({
-            value: safeOutboundFeeInAssetCryptoBaseUnit,
-            precision: asset.precision,
-          }).toPrecision()
-          const minLimit = `${minLimitCryptoPrecision} ${asset.symbol}`
-          return translate('trade.errors.amountTooSmall', {
-            minLimit,
-          })
-        }
-
-        if (withdrawAmountCryptoPrecision.isEqualTo(0)) return ''
-        return hasValidBalance || 'common.insufficientFunds'
-      } catch (e) {
-        console.error(e)
-      } finally {
-        setQuoteLoading(false)
-      }
-    },
-    [
-      accountId,
-      amountAvailableCryptoPrecision,
-      asset,
-      chainId,
-      fromAddress,
-      opportunityData,
-      queryClient,
-      safeOutboundFeeInAssetCryptoBaseUnit,
-      translate,
-      isRunePool,
-    ],
-  )
-
-  const validateCryptoAmount = useCallback(
-    (value: string) => {
-      if (!dispatch) return
-
-      dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: true })
-      return _validateCryptoAmount(value).finally(() => {
-        dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: false })
-      })
-    },
-    [_validateCryptoAmount, dispatch],
-  )
-
-  const validateCryptoAmountDebounced = useMemo(
-    () => pDebounce(validateCryptoAmount, 500),
-    [validateCryptoAmount],
-  )
-
-  const missingFundsForGasTranslation: TextPropTypes['translation'] = useMemo(
-    () => [
-      'modals.confirm.missingFundsForGas',
-      {
-        cryptoAmountHuman: bn(missingFunds ?? 0).toFixed(6, BigNumber.ROUND_UP),
-        assetSymbol: feeAsset.symbol,
-      },
-    ],
-    [missingFunds, feeAsset.symbol],
-  )
-
-  const _validateFiatAmount = useCallback(
-    async (value: string) => {
-      if (!(opportunityData && accountId && dispatch)) return false
-
-      setMissingFunds(null)
-      setQuoteLoading(true)
-      const withdrawAmountCryptoPrecision = bnOrZero(value).div(bnOrZero(assetMarketData?.price))
-      try {
-        const amountAvailableFiat = amountAvailableCryptoPrecision.times(assetMarketData?.price)
-        const valueCryptoPrecision = bnOrZero(value)
-
-        const hasValidStakingBalance =
-          amountAvailableFiat.gt(0) && valueCryptoPrecision.gt(0) && amountAvailableFiat.gte(value)
-
-        const hasValidBalanceForTxPlusFees = await (async () => {
-          if (!hasValidStakingBalance) return false
-          // Only check for sweep + fees at this stage for UTXOs because of reconciliation - this is *not* required for EVM chains
-          if (!isUtxoChainId(chainId)) return true
-          const { hasEnoughBalance: hasEnoughBalanceForTxPlusFeesPlusSweep, missingFunds } =
-            await fetchHasEnoughBalanceForTxPlusFeesPlusSweep({
-              amountCryptoPrecision: withdrawAmountCryptoPrecision.toFixed(),
-              accountId,
-              asset,
-              type: 'withdraw',
-              fromAddress,
-            })
-
-          if (bnOrZero(missingFunds).gt(0)) setMissingFunds(missingFunds)
-
-          return (
-            amountAvailableFiat.gt(0) &&
-            valueCryptoPrecision.gt(0) &&
-            amountAvailableFiat.gte(value) &&
-            hasEnoughBalanceForTxPlusFeesPlusSweep
-          )
-        })()
-
-        if (valueCryptoPrecision.isEqualTo(0)) return ''
-        return hasValidBalanceForTxPlusFees || 'common.insufficientFunds'
-      } catch (e) {
-        return translate('trade.errors.amountTooSmallUnknownMinimum')
-      } finally {
-        setQuoteLoading(false)
-      }
-    },
-    [
-      accountId,
-      amountAvailableCryptoPrecision,
-      asset,
-      assetMarketData?.price,
-      chainId,
-      dispatch,
-      fromAddress,
-      opportunityData,
-      translate,
-    ],
-  )
-
-  const validateFiatAmount = useCallback(
-    (value: string) => {
-      if (!dispatch) return
-
-      dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: true })
-      return _validateFiatAmount(value).finally(() => {
-        dispatch({ type: ThorchainSaversWithdrawActionType.SET_LOADING, payload: false })
-      })
-    },
-    [_validateFiatAmount, dispatch],
-  )
-
-  const validateFiatAmountDebounced = useMemo(
-    () => pDebounce(validateFiatAmount, 500),
-    [validateFiatAmount],
-  )
-
-  const cryptoInputValidation = useMemo(
-    () => ({
-      required: true,
-      validate: { validateCryptoAmountDebounced },
-    }),
-    [validateCryptoAmountDebounced],
-  )
-
-  const fiatInputValidation = useMemo(
-    () => ({
-      required: true,
-      validate: { validateFiatAmountDebounced },
-    }),
-    [validateFiatAmountDebounced],
-  )
-
-  if (!state) return null
-
-  return (
-    <FormProvider {...methods}>
-      <ReusableWithdraw
-        asset={asset}
-        cryptoAmountAvailable={amountAvailableCryptoPrecision.toPrecision()}
-        cryptoInputValidation={cryptoInputValidation}
-        fiatAmountAvailable={fiatAmountAvailable.toPrecision()}
-        fiatInputValidation={fiatInputValidation}
-        marketData={
-          assetMarketData ?? {
-            price: '0',
-            marketCap: '0',
-            volume: '0',
-            changePercent24Hr: 0,
-            supply: '0',
-            maxSupply: '0',
-          }
-        }
-        onCancel={handleCancel}
-        onContinue={handleContinue}
-        isLoading={
-          isEstimatedFeesDataLoading ||
-          isSweepNeededLoading ||
-          isThorchainSaversWithdrawQuoteLoading ||
-          state.loading
-        }
-        percentOptions={percentOptions}
-        enableSlippage={false}
-        handlePercentClick={handlePercentClick}
-      >
-        {!isRunePool ? (
-          <Row>
-            <Row.Label>{translate('common.slippage')}</Row.Label>
-            <Row.Value>
-              <Skeleton isLoaded={!quoteLoading}>
-                <Amount.Crypto value={slippageCryptoAmountPrecision} symbol={asset.symbol} />
-              </Skeleton>
-            </Row.Value>
-          </Row>
-        ) : null}
-        {bnOrZero(missingFunds).gt(0) && (
-          <Alert status='error' borderRadius='lg'>
-            <AlertIcon />
-            <Text translation={missingFundsForGasTranslation} />
-          </Alert>
-        )}
-      </ReusableWithdraw>
-    </FormProvider>
-  )
-}
diff --git a/src/pages/Lending/hooks/useGetEstimatedFeesQuery.ts b/src/hooks/queries/useGetEstimatedFeesQuery.ts
similarity index 100%
rename from src/pages/Lending/hooks/useGetEstimatedFeesQuery.ts
rename to src/hooks/queries/useGetEstimatedFeesQuery.ts
diff --git a/src/pages/Lending/hooks/useIsSweepNeededQuery.ts b/src/hooks/queries/useIsSweepNeededQuery.ts
similarity index 100%
rename from src/pages/Lending/hooks/useIsSweepNeededQuery.ts
rename to src/hooks/queries/useIsSweepNeededQuery.ts
diff --git a/src/hooks/useRouteAccountId/useRouteAccountId.ts b/src/hooks/useRouteAccountId/useRouteAccountId.ts
index 2ab28530364..f260971ac29 100644
--- a/src/hooks/useRouteAccountId/useRouteAccountId.ts
+++ b/src/hooks/useRouteAccountId/useRouteAccountId.ts
@@ -7,10 +7,6 @@ const accountPaths = [
   '/accounts/:accountId',
   '/accounts/:accountId/:chainId/:assetSubId/:nftId',
   '/accounts/:accountId/:chainId/:assetSubId',
-  '/lending/poolAccount/:accountId/:chainId/:assetSubId',
-  '/lending/poolAccount/:accountId/:chainNamespace\\::chainReference/:assetSubId',
-  '/lending/poolAccount/:accountId/:assetId',
-  '/lending/poolAccount/:accountId',
 ]
 
 const getRouteAccountId = (pathname: string) => {
diff --git a/src/hooks/useRouteAssetId/useRouteAssetId.ts b/src/hooks/useRouteAssetId/useRouteAssetId.ts
index ddd56239fc1..da4a0924cf5 100644
--- a/src/hooks/useRouteAssetId/useRouteAssetId.ts
+++ b/src/hooks/useRouteAssetId/useRouteAssetId.ts
@@ -20,17 +20,11 @@ const getRouteAssetId = (pathname: string) => {
     '/wallet/:chainId/:assetSubId',
     '/accounts/:accountId/:chainId/:assetSubId/:nftId',
     '/accounts/:accountId/:chainId/:assetSubId',
-    '/lending/pool/:chainId/:assetSubId/:nftId',
-    '/lending/pool/:chainId/:assetSubId',
-    '/lending/poolAccount/:accountId/:chainId/:assetSubId',
-    '/lending/poolAccount/:accountId/:chainNamespace\\::chainReference/:assetSubId',
   ]
 
   const accountPaths = [
     '/accounts/:accountId/:assetId',
     '/accounts/:chainNamespace\\::chainReference\\:(.+)',
-    '/lending/poolAccount/:accountId/:assetId',
-    '/lending/poolAccount/:chainNamespace\\::chainReference\\:(.+)',
   ]
 
   // Try to match against asset paths
diff --git a/src/lib/utils/thorchain/balance.test.ts b/src/lib/utils/thorchain/balance.test.ts
deleted file mode 100644
index a3cfb8c8982..00000000000
--- a/src/lib/utils/thorchain/balance.test.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-import {
-  getHasEnoughBalanceForTxPlusFees,
-  getHasEnoughBalanceForTxPlusFeesPlusSweep,
-} from './balance'
-
-vi.mock('@/context/QueryClientProvider/queryClient', () => ({ queryClient: {} }))
-vi.mock('@/pages/Lending/hooks/useGetEstimatedFeesQuery', () => ({ queryFn: vi.fn() }))
-vi.mock('@/pages/Lending/hooks/useIsSweepNeededQuery', () => ({
-  getIsSweepNeeded: vi.fn(),
-  isGetSweepNeededInput: vi.fn(),
-}))
-vi.mock('@/state/slices/common-selectors', () => ({
-  selectPortfolioCryptoBalanceByFilter: vi.fn(),
-}))
-vi.mock('@/state/slices/selectors', () => ({
-  selectFeeAssetById: vi.fn(),
-  selectMarketDataByAssetIdUserCurrency: vi.fn(),
-}))
-vi.mock('@/state/store', () => ({ store: { getState: vi.fn() } }))
-vi.mock('./hooks/useGetThorchainSaversDepositQuoteQuery', () => ({
-  fetchThorchainDepositQuote: vi.fn(),
-}))
-vi.mock('./hooks/useGetThorchainSaversWithdrawQuoteQuery', () => ({
-  fetchThorchainWithdrawQuote: vi.fn(),
-}))
-
-describe('getHasEnoughBalanceForTxPlusFees', () => {
-  const precision = 8
-
-  it('returns false when balance is zero', () => {
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '0',
-        amountCryptoPrecision: '1',
-        txFeeCryptoBaseUnit: '100000',
-        precision,
-      }),
-    ).toBe(false)
-  })
-
-  it('returns true when balance covers amount + fee exactly', () => {
-    // amount: 0.5 BTC = 50000000 sats, fee: 10000 sats, total: 50010000 sats
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '50010000',
-        amountCryptoPrecision: '0.5',
-        txFeeCryptoBaseUnit: '10000',
-        precision,
-      }),
-    ).toBe(true)
-  })
-
-  it('returns true when balance exceeds amount + fee', () => {
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '100000000',
-        amountCryptoPrecision: '0.5',
-        txFeeCryptoBaseUnit: '10000',
-        precision,
-      }),
-    ).toBe(true)
-  })
-
-  it('returns false when balance does not cover amount + fee', () => {
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '50000000',
-        amountCryptoPrecision: '0.5',
-        txFeeCryptoBaseUnit: '10000',
-        precision,
-      }),
-    ).toBe(false)
-  })
-
-  it('works with 18-decimal precision', () => {
-    const ethPrecision = 18
-    // balance: 1 ETH, amount: 0.9 ETH, fee: 0.01 ETH
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '1000000000000000000',
-        amountCryptoPrecision: '0.9',
-        txFeeCryptoBaseUnit: '10000000000000000',
-        precision: ethPrecision,
-      }),
-    ).toBe(true)
-  })
-
-  it('returns false when zero amount but fee exceeds balance', () => {
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '1000',
-        amountCryptoPrecision: '0',
-        txFeeCryptoBaseUnit: '2000',
-        precision,
-      }),
-    ).toBe(false)
-  })
-
-  it('handles empty fee string as zero fee', () => {
-    expect(
-      getHasEnoughBalanceForTxPlusFees({
-        balanceCryptoBaseUnit: '100000000',
-        amountCryptoPrecision: '0.5',
-        txFeeCryptoBaseUnit: '',
-        precision,
-      }),
-    ).toBe(true)
-  })
-})
-
-describe('getHasEnoughBalanceForTxPlusFeesPlusSweep', () => {
-  const precision = 8
-
-  it('returns hasEnoughBalance false and missingFunds "0" when balance is zero', () => {
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '0',
-      amountCryptoPrecision: '1',
-      txFeeCryptoBaseUnit: '10000',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '5000',
-    })
-    expect(result.hasEnoughBalance).toBe(false)
-    expect(result.missingFunds).toBe('0')
-  })
-
-  it('returns hasEnoughBalance true when balance covers amount + fee + sweep exactly', () => {
-    // amount: 0.5 BTC = 50000000 sats, fee: 10000, sweep: 5000, total: 50015000
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '50015000',
-      amountCryptoPrecision: '0.5',
-      txFeeCryptoBaseUnit: '10000',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '5000',
-    })
-    expect(result.hasEnoughBalance).toBe(true)
-  })
-
-  it('returns hasEnoughBalance false with correct missingFunds when balance is insufficient', () => {
-    // balance: 50000000 (0.5 BTC), total needed: 50015000, missing: 15000 sats = 0.00015
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '50000000',
-      amountCryptoPrecision: '0.5',
-      txFeeCryptoBaseUnit: '10000',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '5000',
-    })
-    expect(result.hasEnoughBalance).toBe(false)
-    expect(result.missingFunds).toBe('0.00015')
-  })
-
-  it('returns zero missingFunds when balance exceeds total cost', () => {
-    // balance: 1 BTC, total needed: 50015000 sats, surplus clamped to 0 by positiveOrZero
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '100000000',
-      amountCryptoPrecision: '0.5',
-      txFeeCryptoBaseUnit: '10000',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '5000',
-    })
-    expect(result.hasEnoughBalance).toBe(true)
-    expect(result.missingFunds).toBe('0')
-  })
-
-  it('handles zero sweep fee', () => {
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '50010000',
-      amountCryptoPrecision: '0.5',
-      txFeeCryptoBaseUnit: '10000',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '0',
-    })
-    expect(result.hasEnoughBalance).toBe(true)
-  })
-
-  it('works with 18-decimal precision', () => {
-    const ethPrecision = 18
-    // balance: 1 ETH, amount: 0.9 ETH, fee: 0.01 ETH, sweep: 0.005 ETH
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '1000000000000000000',
-      amountCryptoPrecision: '0.9',
-      txFeeCryptoBaseUnit: '10000000000000000',
-      precision: ethPrecision,
-      sweepTxFeeCryptoBaseUnit: '5000000000000000',
-    })
-    expect(result.hasEnoughBalance).toBe(true)
-    expect(result.missingFunds).toBe('0')
-  })
-
-  it('handles empty fee strings as zero', () => {
-    const result = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-      balanceCryptoBaseUnit: '100000000',
-      amountCryptoPrecision: '0.5',
-      txFeeCryptoBaseUnit: '',
-      precision,
-      sweepTxFeeCryptoBaseUnit: '',
-    })
-    expect(result.hasEnoughBalance).toBe(true)
-  })
-})
diff --git a/src/lib/utils/thorchain/balance.ts b/src/lib/utils/thorchain/balance.ts
deleted file mode 100644
index 36553d26aa0..00000000000
--- a/src/lib/utils/thorchain/balance.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import type { AccountId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { BigAmount } from '@shapeshiftoss/utils'
-
-import { isUtxoChainId } from '../utxo'
-import { fromThorBaseUnit } from '.'
-import type { GetThorchainSaversDepositQuoteQueryKey } from './hooks/useGetThorchainSaversDepositQuoteQuery'
-import { fetchThorchainDepositQuote } from './hooks/useGetThorchainSaversDepositQuoteQuery'
-import type { GetThorchainSaversWithdrawQuoteQueryKey } from './hooks/useGetThorchainSaversWithdrawQuoteQuery'
-import { fetchThorchainWithdrawQuote } from './hooks/useGetThorchainSaversWithdrawQuoteQuery'
-
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import type { EstimatedFeesQueryKey } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
-import { queryFn as getEstimatedFeesQueryFn } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
-import type { IsSweepNeededQueryKey } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import {
-  getIsSweepNeeded,
-  isGetSweepNeededInput,
-} from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import { selectPortfolioCryptoBalanceByFilter } from '@/state/slices/common-selectors'
-import type { ThorchainSaversWithdrawQuoteResponseSuccess } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import { selectFeeAssetById, selectMarketDataByAssetIdUserCurrency } from '@/state/slices/selectors'
-import { store } from '@/state/store'
-
-// TODO(gomes): this will work for UTXO but is invalid for tokens since they use diff. denoms
-// the current workaround is to not do fee deduction for non-UTXO chains,
-// but for consistency, we should for native EVM assets, and ensure this is a no-op for tokens
-// Note when implementing this, fee checks/deduction will need to either be done for *native* assets only
-// or handle different denoms for tokens/native assets and display insufficientFundsForProtocolFee copy
-export const getHasEnoughBalanceForTxPlusFees = ({
-  balanceCryptoBaseUnit,
-  amountCryptoPrecision,
-  txFeeCryptoBaseUnit,
-  precision,
-}: {
-  balanceCryptoBaseUnit: string
-  amountCryptoPrecision: string
-  txFeeCryptoBaseUnit: string
-  precision: number
-}) => {
-  const balance = BigAmount.fromBaseUnit({ value: balanceCryptoBaseUnit, precision })
-  if (balance.isZero()) return false
-
-  const amount = BigAmount.fromPrecision({ value: amountCryptoPrecision, precision })
-  const txFee = BigAmount.fromBaseUnit({ value: txFeeCryptoBaseUnit, precision })
-
-  return amount.plus(txFee).lte(balance)
-}
-
-export const getHasEnoughBalanceForTxPlusFeesPlusSweep = ({
-  balanceCryptoBaseUnit,
-  amountCryptoPrecision,
-  txFeeCryptoBaseUnit,
-  precision,
-  sweepTxFeeCryptoBaseUnit,
-}: {
-  balanceCryptoBaseUnit: string
-  amountCryptoPrecision: string
-  txFeeCryptoBaseUnit: string
-  precision: number
-  sweepTxFeeCryptoBaseUnit: string
-}) => {
-  const balance = BigAmount.fromBaseUnit({ value: balanceCryptoBaseUnit, precision })
-  if (balance.isZero()) return { hasEnoughBalance: false, missingFunds: '0' }
-
-  const amount = BigAmount.fromPrecision({ value: amountCryptoPrecision, precision })
-  const txFee = BigAmount.fromBaseUnit({ value: txFeeCryptoBaseUnit, precision })
-  const sweepFee = BigAmount.fromBaseUnit({ value: sweepTxFeeCryptoBaseUnit, precision })
-  const totalCost = amount.plus(txFee).plus(sweepFee)
-
-  return {
-    hasEnoughBalance: totalCost.lte(balance),
-    missingFunds: totalCost.minus(balance).positiveOrZero().toPrecision(),
-  }
-}
-
-export const fetchHasEnoughBalanceForTxPlusFeesPlusSweep = async ({
-  amountCryptoPrecision: _amountCryptoPrecision,
-  accountId,
-  asset,
-  type,
-  fromAddress,
-}: {
-  asset: Asset
-  fromAddress: string | undefined
-  amountCryptoPrecision: string
-  accountId: AccountId
-  type: 'deposit' | 'withdraw'
-}) => {
-  const isUtxoChain = isUtxoChainId(asset.chainId)
-  const estimateFeesQueryEnabled = Boolean(fromAddress && accountId && isUtxoChain)
-
-  const balanceCryptoBaseUnit = selectPortfolioCryptoBalanceByFilter(store.getState(), {
-    assetId: asset.assetId,
-    accountId,
-  }).toBaseUnit()
-  const feeAsset = selectFeeAssetById(store.getState(), asset.assetId)
-  const feeAssetMarketData = selectMarketDataByAssetIdUserCurrency(
-    store.getState(),
-    feeAsset?.assetId ?? '',
-  )
-  const quote = await (async () => {
-    switch (type) {
-      case 'withdraw': {
-        const withdrawAmountCryptoBaseUnit = BigAmount.fromPrecision({
-          value: _amountCryptoPrecision,
-          precision: asset.precision,
-        }).toBaseUnit()
-
-        const thorchainSaversWithdrawQuoteQueryKey: GetThorchainSaversWithdrawQuoteQueryKey = [
-          'thorchainSaversWithdrawQuote',
-          { asset, accountId, amountCryptoBaseUnit: withdrawAmountCryptoBaseUnit },
-        ]
-
-        return queryClient.fetchQuery({
-          queryKey: thorchainSaversWithdrawQuoteQueryKey,
-          queryFn: () =>
-            fetchThorchainWithdrawQuote({
-              asset,
-              accountId,
-              amountCryptoBaseUnit: withdrawAmountCryptoBaseUnit,
-            }),
-          staleTime: 5000,
-        })
-      }
-      case 'deposit': {
-        const amountCryptoBaseUnit = BigAmount.fromPrecision({
-          value: _amountCryptoPrecision,
-          precision: asset.precision,
-        }).toBaseUnit()
-
-        const thorchainSaversDepositQuoteQueryKey: GetThorchainSaversDepositQuoteQueryKey = [
-          'thorchainSaversDepositQuote',
-          { asset, amountCryptoBaseUnit },
-        ]
-
-        return await queryClient.fetchQuery({
-          queryKey: thorchainSaversDepositQuoteQueryKey,
-          queryFn: () => fetchThorchainDepositQuote({ asset, amountCryptoBaseUnit }),
-          staleTime: 5000,
-        })
-      }
-      default:
-        throw new Error('Invalid type')
-    }
-  })()
-
-  const amountCryptoPrecision =
-    type === 'deposit'
-      ? _amountCryptoPrecision
-      : fromThorBaseUnit(
-          (quote as ThorchainSaversWithdrawQuoteResponseSuccess).dust_amount,
-        ).toFixed()
-
-  const amountCryptoBaseUnit = BigAmount.fromPrecision({
-    value: amountCryptoPrecision,
-    precision: type === 'deposit' ? asset.precision : feeAsset?.precision ?? 0,
-  }).toBaseUnit()
-
-  const estimatedFeesQueryArgs = {
-    estimateFeesInput: {
-      amountCryptoPrecision,
-      assetId: asset.assetId,
-      feeAssetId: feeAsset?.assetId ?? '',
-      to: quote?.inbound_address ?? '',
-      sendMax: false,
-      accountId: accountId ?? '',
-      contractAddress: undefined,
-    },
-    feeAsset,
-    feeAssetMarketData,
-    enabled: Boolean(feeAsset && estimateFeesQueryEnabled),
-  }
-
-  const estimatedFeesQueryKey: EstimatedFeesQueryKey = ['estimateFees', estimatedFeesQueryArgs]
-
-  const _estimatedFeesData = estimateFeesQueryEnabled
-    ? await queryClient.fetchQuery({
-        queryKey: estimatedFeesQueryKey,
-        queryFn: getEstimatedFeesQueryFn,
-      })
-    : undefined
-
-  const _hasEnoughBalanceForTxPlusFees = getHasEnoughBalanceForTxPlusFees({
-    precision: asset.precision,
-    balanceCryptoBaseUnit,
-    amountCryptoPrecision,
-    txFeeCryptoBaseUnit: _estimatedFeesData?.txFeeCryptoBaseUnit ?? '',
-  })
-
-  const isSweepNeededQueryEnabled = Boolean(
-    bnOrZero(amountCryptoPrecision).gt(0) && _estimatedFeesData && _hasEnoughBalanceForTxPlusFees,
-  )
-
-  const isSweepNeededQueryArgs = {
-    assetId: asset.assetId,
-    address: fromAddress,
-    txFeeCryptoBaseUnit: _estimatedFeesData?.txFeeCryptoBaseUnit ?? '0',
-    amountCryptoBaseUnit,
-  }
-
-  const isSweepNeededQueryKey: IsSweepNeededQueryKey = ['isSweepNeeded', isSweepNeededQueryArgs]
-
-  const _isSweepNeeded =
-    isSweepNeededQueryEnabled && isGetSweepNeededInput(isSweepNeededQueryArgs)
-      ? await queryClient.fetchQuery({
-          queryKey: isSweepNeededQueryKey,
-          queryFn: () => getIsSweepNeeded(isSweepNeededQueryArgs),
-          staleTime: 60_000,
-        })
-      : undefined
-
-  const isEstimateSweepFeesQueryEnabled = Boolean(_isSweepNeeded && accountId && isUtxoChain)
-
-  const estimatedSweepFeesQueryArgs = {
-    feeAsset,
-    feeAssetMarketData,
-    estimateFeesInput: {
-      amountCryptoPrecision: '0',
-      assetId: asset.assetId,
-      feeAssetId: feeAsset?.assetId ?? '',
-      to: fromAddress ?? '',
-      sendMax: true,
-      accountId: accountId ?? '',
-      contractAddress: undefined,
-    },
-    enabled: isEstimateSweepFeesQueryEnabled,
-  }
-
-  const estimatedSweepFeesQueryKey: EstimatedFeesQueryKey = [
-    'estimateFees',
-    estimatedSweepFeesQueryArgs,
-  ]
-
-  const _estimatedSweepFeesData = isEstimateSweepFeesQueryEnabled
-    ? await queryClient.fetchQuery({
-        queryKey: estimatedSweepFeesQueryKey,
-        queryFn: getEstimatedFeesQueryFn,
-      })
-    : undefined
-
-  const { hasEnoughBalance, missingFunds } = getHasEnoughBalanceForTxPlusFeesPlusSweep({
-    precision: asset.precision,
-    balanceCryptoBaseUnit,
-    amountCryptoPrecision,
-    txFeeCryptoBaseUnit: _estimatedFeesData?.txFeeCryptoBaseUnit ?? '0',
-    sweepTxFeeCryptoBaseUnit: _estimatedSweepFeesData?.txFeeCryptoBaseUnit ?? '0',
-  })
-
-  const hasEnoughBalanceForTxPlusFeesPlusSweep =
-    bnOrZero(balanceCryptoBaseUnit).gt(0) && hasEnoughBalance
-
-  return { hasEnoughBalance: hasEnoughBalanceForTxPlusFeesPlusSweep, missingFunds }
-}
diff --git a/src/lib/utils/thorchain/constants.ts b/src/lib/utils/thorchain/constants.ts
index 3e94e136102..098db371e1d 100644
--- a/src/lib/utils/thorchain/constants.ts
+++ b/src/lib/utils/thorchain/constants.ts
@@ -1,3 +1,18 @@
+import type { AssetId } from '@shapeshiftoss/caip'
+import {
+  avalancheAssetId,
+  bchAssetId,
+  binanceAssetId,
+  bscAssetId,
+  btcAssetId,
+  cosmosAssetId,
+  dogeAssetId,
+  ethAssetId,
+  ltcAssetId,
+  thorchainAssetId,
+  tronAssetId,
+} from '@shapeshiftoss/caip'
+
 import { bn } from '@/lib/bignumber/bignumber'
 
 export const THOR_PRECISION = 8
@@ -11,3 +26,27 @@ export const THORCHAIN_OUTBOUND_FEE_CRYPTO_BASE_UNIT = '2000000'
 export const THORCHAIN_BLOCK_TIME_SECONDS = '6'
 export const thorchainBlockTimeMs = bn(THORCHAIN_BLOCK_TIME_SECONDS).times(1000).toNumber()
 export const RUNEPOOL_DEPOSIT_MEMO = 'POOL+'
+
+const usdcEthereumAssetId: AssetId = 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'
+const usdcAvalancheAssetId: AssetId =
+  'eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e'
+const usdtEthereumAssetId: AssetId = 'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7'
+
+// The minimum amount to be sent both for deposit and withdraws
+// else it will be considered a dust attack and gifted to the network
+export const THORCHAIN_DUST_THRESHOLDS_CRYPTO_BASE_UNIT: Record<AssetId, string> = {
+  [btcAssetId]: '10000',
+  [bchAssetId]: '10000',
+  [ltcAssetId]: '10000',
+  [dogeAssetId]: '100000000',
+  [ethAssetId]: '10000000000',
+  [avalancheAssetId]: '10000000000',
+  [bscAssetId]: '10000000000',
+  [cosmosAssetId]: '1', // the inbound address dust_threshold is '0', but LP withdrawls fail without a dust value
+  [thorchainAssetId]: '1', // partial LP withdrawls fail without a dust value
+  [tronAssetId]: '1', // the inbound address dust_threshold is '0', but TRON rejects 0-value transactions
+  [binanceAssetId]: '0',
+  [usdcEthereumAssetId]: '0',
+  [usdtEthereumAssetId]: '0',
+  [usdcAvalancheAssetId]: '0',
+}
diff --git a/src/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery.tsx b/src/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery.tsx
deleted file mode 100644
index cd6205a9ad0..00000000000
--- a/src/lib/utils/thorchain/hooks/useGetThorchainSaversDepositQuoteQuery.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { Asset } from '@shapeshiftoss/types'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import type { BigNumber } from '@/lib/bignumber/bignumber'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import type { PartialFields } from '@/lib/types'
-import type { ThorchainSaversDepositQuoteResponseSuccess } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
-import { getMaybeThorchainSaversDepositQuote } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-
-type FetchThorchainDepositQuoteInput = {
-  asset: Asset
-  amountCryptoBaseUnit: BigNumber.Value | null | undefined
-}
-
-export type GetThorchainSaversDepositQuoteQueryKey = [
-  'thorchainSaversDepositQuote',
-  PartialFields<FetchThorchainDepositQuoteInput, 'asset'>,
-]
-export const fetchThorchainDepositQuote = async ({
-  asset,
-  amountCryptoBaseUnit,
-}: FetchThorchainDepositQuoteInput) => {
-  const maybeQuote = await getMaybeThorchainSaversDepositQuote({
-    asset,
-    amountCryptoBaseUnit,
-  })
-
-  if (maybeQuote.isErr()) throw new Error(maybeQuote.unwrapErr())
-
-  return maybeQuote.unwrap()
-}
-
-export const useGetThorchainSaversDepositQuoteQuery = <
-  SelectData = ThorchainSaversDepositQuoteResponseSuccess,
->({
-  asset,
-  amountCryptoBaseUnit,
-  enabled = true,
-  select,
-}: {
-  asset: Asset | undefined
-  amountCryptoBaseUnit: BigNumber.Value | null | undefined
-  enabled?: boolean
-  select?: (stakingInfo: ThorchainSaversDepositQuoteResponseSuccess) => SelectData
-}) => {
-  const depositQuoteQueryKey: GetThorchainSaversDepositQuoteQueryKey = useMemo(
-    () => ['thorchainSaversDepositQuote', { asset, amountCryptoBaseUnit }],
-    [amountCryptoBaseUnit, asset],
-  )
-
-  const depositQuoteQuery = useQuery({
-    queryKey: depositQuoteQueryKey,
-    queryFn:
-      enabled && asset && Boolean(bnOrZero(amountCryptoBaseUnit).gt(0))
-        ? () => fetchThorchainDepositQuote({ asset, amountCryptoBaseUnit })
-        : skipToken,
-    staleTime: 5000,
-    select,
-    retry: false,
-  })
-
-  return depositQuoteQuery
-}
diff --git a/src/lib/utils/thorchain/hooks/useGetThorchainSaversWithdrawQuoteQuery.tsx b/src/lib/utils/thorchain/hooks/useGetThorchainSaversWithdrawQuoteQuery.tsx
deleted file mode 100644
index fccc8472a7d..00000000000
--- a/src/lib/utils/thorchain/hooks/useGetThorchainSaversWithdrawQuoteQuery.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { AccountId } from '@shapeshiftoss/caip'
-import { fromAssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import type { BigNumber } from '@/lib/bignumber/bignumber'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import type { PartialFields } from '@/lib/types'
-import {
-  getThorchainSaversWithdrawQuote,
-  getWithdrawBps,
-} from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
-import { serializeUserStakingId, toOpportunityId } from '@/state/slices/opportunitiesSlice/utils'
-import { selectEarnUserStakingOpportunityByUserStakingId } from '@/state/slices/selectors'
-import { store } from '@/state/store'
-
-type FetchThorchainWithdrawQuoteInput = {
-  asset: Asset
-  accountId: AccountId
-  amountCryptoBaseUnit: BigNumber.Value
-}
-
-export type GetThorchainSaversWithdrawQuoteQueryKey = [
-  'thorchainSaversWithdrawQuote',
-  PartialFields<FetchThorchainWithdrawQuoteInput, 'accountId'>,
-]
-export const fetchThorchainWithdrawQuote = async ({
-  asset,
-  accountId,
-  amountCryptoBaseUnit,
-}: FetchThorchainWithdrawQuoteInput) => {
-  const { chainId, assetNamespace, assetReference } = fromAssetId(asset.assetId)
-  const opportunityId = toOpportunityId({ chainId, assetNamespace, assetReference })
-  const opportunityData = selectEarnUserStakingOpportunityByUserStakingId(store.getState(), {
-    userStakingId: serializeUserStakingId(accountId, opportunityId ?? ''),
-  })
-
-  const withdrawBps = getWithdrawBps({
-    withdrawAmountCryptoBaseUnit: amountCryptoBaseUnit ?? 0,
-    stakedAmountCryptoBaseUnit: opportunityData?.stakedAmountCryptoBaseUnit ?? '0',
-    rewardsAmountCryptoBaseUnit: opportunityData?.rewardsCryptoBaseUnit?.amounts[0] ?? '0',
-  })
-
-  const maybeQuote = await getThorchainSaversWithdrawQuote({
-    asset,
-    bps: withdrawBps,
-    accountId,
-  })
-
-  if (maybeQuote.isErr()) throw new Error(maybeQuote.unwrapErr())
-
-  return maybeQuote.unwrap()
-}
-
-export const useGetThorchainSaversWithdrawQuoteQuery = ({
-  asset,
-  accountId,
-  amountCryptoBaseUnit,
-  enabled = true,
-}: PartialFields<FetchThorchainWithdrawQuoteInput, 'accountId'> & {
-  enabled?: boolean
-}) => {
-  const withdrawQuoteQueryKey: GetThorchainSaversWithdrawQuoteQueryKey = useMemo(
-    () => ['thorchainSaversWithdrawQuote', { asset, accountId, amountCryptoBaseUnit }],
-    [accountId, amountCryptoBaseUnit, asset],
-  )
-
-  const withdrawQuoteQuery = useQuery({
-    queryKey: withdrawQuoteQueryKey,
-    queryFn:
-      enabled && accountId && bnOrZero(amountCryptoBaseUnit).gt(0)
-        ? () => fetchThorchainWithdrawQuote({ asset, accountId, amountCryptoBaseUnit })
-        : skipToken,
-    staleTime: 5000,
-  })
-
-  return withdrawQuoteQuery
-}
diff --git a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx
index 0ab1dc9820b..43e9f566f1a 100644
--- a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx
+++ b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx
@@ -16,6 +16,7 @@ import { fromThorBaseUnit, getThorchainMsgDepositCoin, getThorchainTransactionTy
 import type { SendInput } from '@/components/Modals/Send/Form'
 import type { EstimateFeesInput } from '@/components/Modals/Send/utils'
 import { estimateFees, handleSend } from '@/components/Modals/Send/utils'
+import { useGetEstimatedFeesQuery } from '@/hooks/queries/useGetEstimatedFeesQuery'
 import { useWallet } from '@/hooks/useWallet/useWallet'
 import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
 import { assertUnreachable } from '@/lib/utils'
@@ -27,13 +28,12 @@ import {
 } from '@/lib/utils/evm'
 import {
   THORCHAIN_AFFILIATE_NAME,
+  THORCHAIN_DUST_THRESHOLDS_CRYPTO_BASE_UNIT,
   THORCHAIN_OUTBOUND_FEE_CRYPTO_BASE_UNIT,
   THORCHAIN_POOL_MODULE_ADDRESS,
 } from '@/lib/utils/thorchain/constants'
-import { useGetEstimatedFeesQuery } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
 import { reactQueries } from '@/react-queries'
 import { selectInboundAddressData } from '@/react-queries/selectors'
-import { THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
 import { preferences } from '@/state/slices/preferencesSlice/preferencesSlice'
 import {
   selectAccountNumberByAccountId,
@@ -47,11 +47,7 @@ type Action =
   | 'swap'
   | 'addLiquidity'
   | 'withdrawLiquidity'
-  | 'openLoan'
-  | 'repayLoan'
-  | 'depositSavers'
   | 'depositRunepool'
-  | 'withdrawSavers'
   | 'withdrawRunepool'
   | 'claimTcy'
   | 'stakeTcy'
@@ -69,7 +65,7 @@ type UseSendThorTxProps = {
   dustAmountCryptoBaseUnit?: string
 }
 
-const actionsWithDustAmount: Action[] = ['withdrawLiquidity', 'withdrawSavers', 'claimTcy']
+const actionsWithDustAmount: Action[] = ['withdrawLiquidity', 'claimTcy']
 
 export const useSendThorTx = ({
   accountId,
@@ -106,7 +102,7 @@ export const useSendThorTx = ({
   const dustAmountCryptoBaseUnit = useMemo(() => {
     return _dustAmountCryptoBaseUnit
       ? _dustAmountCryptoBaseUnit
-      : THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[feeAsset?.assetId ?? ''] ?? '0'
+      : THORCHAIN_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[feeAsset?.assetId ?? ''] ?? '0'
   }, [_dustAmountCryptoBaseUnit, feeAsset?.assetId])
 
   const amountOrDustCryptoBaseUnit = useMemo(() => {
diff --git a/src/lib/utils/thorchain/hooks/useThorchainFromAddress.tsx b/src/lib/utils/thorchain/hooks/useThorchainFromAddress.tsx
index 160e3d9da02..d90e21732b1 100644
--- a/src/lib/utils/thorchain/hooks/useThorchainFromAddress.tsx
+++ b/src/lib/utils/thorchain/hooks/useThorchainFromAddress.tsx
@@ -4,10 +4,9 @@ import type { AccountMetadata } from '@shapeshiftoss/types'
 import { skipToken, useQuery } from '@tanstack/react-query'
 
 import { getThorchainFromAddress } from '..'
-import type { getThorchainLendingPosition } from '../lending'
+import type { getThorchainSaversPosition } from '../savers'
 
 import type { getThorchainLpPosition } from '@/pages/ThorChainLP/queries/queries'
-import type { getThorchainSaversPosition } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
 
 type UseThorchainFromAddressArgs = {
   accountId: AccountId | undefined
@@ -15,10 +14,7 @@ type UseThorchainFromAddressArgs = {
   opportunityId: string | undefined
   wallet: HDWallet | null
   accountMetadata: AccountMetadata | undefined
-  getPosition:
-    | typeof getThorchainLendingPosition
-    | typeof getThorchainSaversPosition
-    | typeof getThorchainLpPosition
+  getPosition: typeof getThorchainSaversPosition | typeof getThorchainLpPosition
   select?: (maybeAddress: string) => string | undefined
   enabled?: boolean
 }
diff --git a/src/lib/utils/thorchain/index.ts b/src/lib/utils/thorchain/index.ts
index c3c497e8e0a..f14c4148130 100644
--- a/src/lib/utils/thorchain/index.ts
+++ b/src/lib/utils/thorchain/index.ts
@@ -23,15 +23,15 @@ import type {
   KnownChainIds,
 } from '@shapeshiftoss/types'
 import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { BigAmount } from '@shapeshiftoss/utils'
+import { BigAmount, bnOrZero } from '@shapeshiftoss/utils'
 import axios from 'axios'
 import dayjs from 'dayjs'
 import memoize from 'lodash/memoize'
 
 import { getSupportedEvmChainIds } from '../evm'
 import { assertGetUtxoChainAdapter, isUtxoAccountId, isUtxoChainId } from '../utxo'
-import { THOR_PRECISION } from './constants'
-import { getThorchainLendingPosition } from './lending'
+import { BASE_BPS_POINTS, THOR_PRECISION } from './constants'
+import { getThorchainSaversPosition } from './savers'
 
 import { getConfig } from '@/config'
 import { getChainAdapterManager } from '@/context/PluginProvider/chainAdapterSingleton'
@@ -39,7 +39,6 @@ import type { BigNumber, BN } from '@/lib/bignumber/bignumber'
 import { bn } from '@/lib/bignumber/bignumber'
 import { poll } from '@/lib/poll/poll'
 import type { getThorchainLpPosition } from '@/pages/ThorChainLP/queries/queries'
-import { getThorchainSaversPosition } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
 
 export const getThorchainTransactionStatus = async ({
   txHash,
@@ -153,6 +152,26 @@ export const toThorBaseUnit = ({
     .decimalPlaces(0)
 }
 
+export const getWithdrawBps = ({
+  withdrawAmountCryptoBaseUnit,
+  stakedAmountCryptoBaseUnit,
+  rewardsAmountCryptoBaseUnit,
+}: {
+  withdrawAmountCryptoBaseUnit: BigNumber.Value
+  stakedAmountCryptoBaseUnit: BigNumber.Value
+  rewardsAmountCryptoBaseUnit: BigNumber.Value
+}) => {
+  const stakedAmountCryptoBaseUnitIncludeRewards = bnOrZero(stakedAmountCryptoBaseUnit).plus(
+    rewardsAmountCryptoBaseUnit,
+  )
+
+  const withdrawRatio = bnOrZero(withdrawAmountCryptoBaseUnit).div(
+    stakedAmountCryptoBaseUnitIncludeRewards,
+  )
+
+  return withdrawRatio.times(BASE_BPS_POINTS).toFixed(0)
+}
+
 export const getThorchainFromAddress = async ({
   accountId,
   assetId,
@@ -164,10 +183,7 @@ export const getThorchainFromAddress = async ({
   accountId: AccountId
   assetId: AssetId
   opportunityId?: string
-  getPosition:
-    | typeof getThorchainLendingPosition
-    | typeof getThorchainSaversPosition
-    | typeof getThorchainLpPosition
+  getPosition: typeof getThorchainSaversPosition | typeof getThorchainLpPosition
   accountMetadata: AccountMetadata
   wallet: HDWallet
 }): Promise<string> => {
@@ -182,8 +198,6 @@ export const getThorchainFromAddress = async ({
     })
     if (!position) throw new Error(`No position found for assetId: ${assetId}`)
     const address: string = (() => {
-      // THORChain lending position
-      if ('owner' in position) return position.owner
       // THORChain savers position
       if ('asset_address' in position) return position.asset_address
       // THORChain LP position. Note we accesss assetAddress, never runeAddress, because of the !isUtxoChainId check above
@@ -233,25 +247,17 @@ export const getThorfiUtxoFromAddresses = async ({
   if (!isUtxoChainId(chainId)) throw new Error(`ChainId ${chainId} is not a UTXO chain`)
 
   try {
-    const [saverPosition, lendingPosition] = await Promise.all([
-      getThorchainSaversPosition({ accountId, assetId }),
-      getThorchainLendingPosition({ accountId, assetId }),
-    ])
+    const saverPosition = await getThorchainSaversPosition({ accountId, assetId })
 
-    if (!saverPosition && !lendingPosition)
+    if (!saverPosition)
       throw new Error(`No position found for assetId: ${assetId}, defaulting to 0 account_index`)
 
-    // Unique addies set, to avoid view-layer dupes since addies are most likely the same over savers and lending
     const addresses = new Set<string>()
 
-    if (saverPosition?.asset_address) {
+    if (saverPosition.asset_address) {
       addresses.add(saverPosition.asset_address)
     }
 
-    if (lendingPosition?.owner) {
-      addresses.add(lendingPosition.owner)
-    }
-
     return Array.from(addresses)
   } catch {
     const chainAdapter = getChainAdapterManager().get(chainId)
diff --git a/src/lib/utils/thorchain/lending/index.ts b/src/lib/utils/thorchain/lending/index.ts
deleted file mode 100644
index c9062b76e69..00000000000
--- a/src/lib/utils/thorchain/lending/index.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAccountId, fromAssetId } from '@shapeshiftoss/caip'
-import type { ThornodePoolResponse } from '@shapeshiftoss/swapper'
-import { assetIdToThorPoolAssetId } from '@shapeshiftoss/swapper'
-import { convertDecimalPercentageToBasisPoints } from '@shapeshiftoss/utils'
-import type { Result } from '@sniptt/monads'
-import { Err, Ok } from '@sniptt/monads'
-import axios from 'axios'
-
-import { isUtxoChainId } from '../../utxo'
-import type {
-  Borrower,
-  BorrowersResponse,
-  BorrowersResponseSuccess,
-  LendingDepositQuoteResponse,
-  LendingDepositQuoteResponseSuccess,
-  LendingWithdrawQuoteResponse,
-  LendingWithdrawQuoteResponseSuccess,
-} from './types'
-
-import { getConfig } from '@/config'
-import type { BigNumber } from '@/lib/bignumber/bignumber'
-import { bn } from '@/lib/bignumber/bignumber'
-import { getAccountAddresses, toThorBaseUnit } from '@/lib/utils/thorchain'
-import { selectAssetById } from '@/state/slices/selectors'
-import { store } from '@/state/store'
-
-// Note, this isn't exhaustive. These are the minimum viable fields for this to work
-// but we might need e.g min_out and affiliate_bps
-// see https://thornode.ninerealms.com/thorchain/doc
-export const getMaybeThorchainLendingOpenQuote = async ({
-  collateralAssetId,
-  collateralAmountCryptoBaseUnit,
-  receiveAssetId,
-  receiveAssetAddress,
-}: {
-  collateralAssetId: AssetId
-  collateralAmountCryptoBaseUnit: BigNumber.Value | null | undefined
-  receiveAssetId: AssetId
-  receiveAssetAddress: string
-}): Promise<Result<LendingDepositQuoteResponseSuccess, string>> => {
-  if (!collateralAmountCryptoBaseUnit) return Err('Amount is required')
-  const collateralAsset = selectAssetById(store.getState(), collateralAssetId)
-  if (!collateralAsset) return Err(`Asset not found for assetId ${collateralAssetId}`)
-  const amountCryptoThorBaseUnit = toThorBaseUnit({
-    valueCryptoBaseUnit: collateralAmountCryptoBaseUnit,
-    asset: collateralAsset,
-  })
-
-  const from_asset = assetIdToThorPoolAssetId({ assetId: collateralAssetId })
-  if (!from_asset) return Err(`Pool asset not found for assetId ${collateralAssetId}`)
-  const to_asset = assetIdToThorPoolAssetId({ assetId: receiveAssetId })
-  if (!to_asset) return Err(`Pool asset not found for assetId ${receiveAssetId}`)
-
-  const { VITE_THORCHAIN_NODE_URL } = getConfig()
-  if (!VITE_THORCHAIN_NODE_URL) return Err('THORChain node URL is not configured')
-
-  // The THORChain quote endpoint expects BCH receiveAddress's to be stripped of the "bitcoincash:" prefix
-  const parsedReceiveAddress = receiveAssetAddress.replace('bitcoincash:', '')
-
-  const url =
-    `${VITE_THORCHAIN_NODE_URL}/thorchain/quote/loan/open` +
-    `?from_asset=${from_asset}` +
-    `&amount=${amountCryptoThorBaseUnit.toString()}` +
-    `&to_asset=${to_asset}` +
-    `&destination=${parsedReceiveAddress}`
-
-  const { data } = await axios.get<LendingDepositQuoteResponse>(url)
-  if (!data) return Err('Could not get quote data')
-  if ('error' in data) return Err(data.error)
-
-  return Ok(data)
-}
-
-// Note, this isn't exhaustive. These are the minimum viable fields for this to work
-// but we might need e.g min_out and affiliate_bps
-// see https://thornode.ninerealms.com/thorchain/doc
-export const getMaybeThorchainLendingCloseQuote = async ({
-  collateralAssetId,
-  repaymentPercent,
-  repaymentAssetId,
-  collateralAssetAddress,
-}: {
-  collateralAssetId: AssetId
-  repaymentPercent: number
-  repaymentAssetId: AssetId
-  collateralAssetAddress: string
-}): Promise<Result<LendingWithdrawQuoteResponseSuccess, string>> => {
-  if (!repaymentPercent) return Err('A non-zero amount is required')
-
-  const repaymentAsset = selectAssetById(store.getState(), repaymentAssetId)
-  if (!repaymentAsset) return Err(`Asset not found for assetId ${repaymentAsset}`)
-  const repayBps = convertDecimalPercentageToBasisPoints(bn(repaymentPercent).div(100).toNumber())
-
-  const from_asset = assetIdToThorPoolAssetId({ assetId: repaymentAssetId })
-  if (!from_asset) return Err(`Pool asset not found for assetId ${repaymentAssetId}`)
-  const to_asset = assetIdToThorPoolAssetId({ assetId: collateralAssetId })
-  if (!to_asset) return Err(`Pool asset not found for assetId ${collateralAssetId}`)
-
-  const { VITE_THORCHAIN_NODE_URL } = getConfig()
-  if (!VITE_THORCHAIN_NODE_URL) return Err('THORChain node URL is not configured')
-
-  // The THORChain quote endpoint expects BCH receiveAddress's to be stripped of the "bitcoincash:" prefix
-  const parsedCollateralAssetAddress = collateralAssetAddress.replace('bitcoincash:', '')
-
-  const url =
-    `${VITE_THORCHAIN_NODE_URL}/thorchain/quote/loan/close` +
-    `?from_asset=${from_asset}` +
-    `&repay_bps=${repayBps.toString()}` +
-    `&to_asset=${to_asset}` +
-    `&loan_owner=${parsedCollateralAssetAddress}`
-
-  const { data } = await axios.get<LendingWithdrawQuoteResponse>(url)
-  // TODO(gomes): handle "loan hasn't reached maturity" which is a legit flow, not an actual error
-  // i.e
-  // "failed to simulate handler: loan repayment is unavailable: loan hasn't reached maturity"
-  if (!data) return Err('Could not get quote data')
-  if ('error' in data) return Err(data.error)
-
-  return Ok(data)
-}
-
-export const getAllThorchainLendingPositions = async (
-  assetId: AssetId,
-): Promise<BorrowersResponseSuccess> => {
-  const poolAssetId = assetIdToThorPoolAssetId({ assetId })
-
-  if (!poolAssetId) throw new Error(`Pool asset not found for assetId ${assetId}`)
-
-  const { data } = await axios.get<BorrowersResponse>(
-    `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolAssetId}/borrowers`,
-  )
-
-  if (!data || 'error' in data) return []
-
-  return data
-}
-
-export const getThorchainLendingPosition = async ({
-  accountId,
-  assetId,
-}: {
-  accountId: AccountId | null
-  assetId: AssetId
-}): Promise<Borrower | null> => {
-  if (!accountId) return null
-
-  const address = fromAccountId(accountId).account
-  const poolAssetId = assetIdToThorPoolAssetId({ assetId })
-
-  const accountPosition = await (async () => {
-    if (!isUtxoChainId(fromAssetId(assetId).chainId))
-      return (
-        await axios.get<Borrower>(
-          `${
-            getConfig().VITE_THORCHAIN_NODE_URL
-          }/thorchain/pool/${poolAssetId}/borrower/${address}`,
-        )
-      ).data
-
-    const lendingPositionsResponse = await getAllThorchainLendingPositions(assetId)
-
-    const allPositions = lendingPositionsResponse
-    if (!allPositions.length) {
-      return null
-    }
-
-    const accountAddresses = await getAccountAddresses(accountId)
-
-    return allPositions.find(position => accountAddresses.includes(position.owner))
-  })()
-
-  return accountPosition || null
-}
-
-export const getThorchainPoolInfo = async (assetId: AssetId): Promise<ThornodePoolResponse> => {
-  const { VITE_THORCHAIN_NODE_URL } = getConfig()
-
-  if (!VITE_THORCHAIN_NODE_URL) {
-    throw new Error('THORChain node URL is not configured')
-  }
-
-  const poolAssetId = assetIdToThorPoolAssetId({ assetId })
-  if (!poolAssetId) throw new Error(`Pool asset not found for assetId ${assetId}`)
-
-  const { data } = await axios.get<ThornodePoolResponse>(
-    `${VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolAssetId}`,
-  )
-
-  if (!data) {
-    throw new Error('No data received from THORChain')
-  }
-
-  return data
-}
diff --git a/src/lib/utils/thorchain/lending/types.ts b/src/lib/utils/thorchain/lending/types.ts
deleted file mode 100644
index 1a8ba22d6ae..00000000000
--- a/src/lib/utils/thorchain/lending/types.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-// TODO(gomes): this isn't lending specific and we should consolidate these across THOR domains
-export type QuoteFees = {
-  asset: string
-  affiliate?: string
-  outbound?: string
-  liquidity: string
-  total: string
-  slippage_bps: number
-  total_bps: number
-}
-
-type BaseQuoteResponse = {
-  dust_threshold: string
-  expected_amount_out: string
-  expiry: number
-  fees: QuoteFees
-  inbound_address: string
-  inbound_confirmation_blocks: number
-  inbound_confirmation_seconds: number
-  memo: string
-  notes: string
-  outbound_delay_blocks: number
-  outbound_delay_seconds: number
-  recommended_min_amount_in: string
-  router: string
-  warning: string
-}
-
-export type LendingDepositQuoteResponseSuccess = BaseQuoteResponse & {
-  expected_debt_issued: string
-  expected_collateral_deposited: string
-  expected_collateralization_ratio: string
-}
-
-export type LendingDepositQuoteResponseError = {
-  error: string
-}
-
-export type LendingDepositQuoteResponse =
-  | LendingDepositQuoteResponseSuccess
-  | LendingDepositQuoteResponseError
-
-export type LendingWithdrawQuoteResponseSuccess = BaseQuoteResponse & {
-  expected_amount_in: string
-  expected_collateral_withdrawn: string
-  expected_debt_repaid: string
-}
-
-export type LendingWithdrawQuoteResponseError = {
-  error: string
-}
-
-export type LendingWithdrawQuoteResponse =
-  | LendingWithdrawQuoteResponseSuccess
-  | LendingWithdrawQuoteResponseError
-
-export type Borrower = {
-  owner: string
-  asset: string
-  debt_issued: string
-  debt_repaid: string
-  debt_current: string
-  collateral_deposited: string
-  collateral_withdrawn: string
-  collateral_current: string
-  last_open_height: number
-  last_repay_height: number
-}
-
-export type BorrowersResponseSuccess = Borrower[]
-
-export type BorrowersResponseError = {
-  error: string
-}
-
-export type BorrowersResponse = BorrowersResponseSuccess | BorrowersResponseError
-
-export type LendingQuoteOpen = {
-  quoteCollateralAmountCryptoPrecision: string
-  quoteCollateralAmountFiatUserCurrency: string
-  quoteCollateralAmountFiatUsd: string
-  quoteDebtAmountUserCurrency: string
-  quoteDebtAmountUsd: string
-  quoteBorrowedAmountCryptoPrecision: string
-  quoteBorrowedAmountUserCurrency: string
-  quoteBorrowedAmountUsd: string
-  quoteCollateralizationRatioPercentDecimal: string
-  quoteSlippageBorrowedAssetCryptoPrecision: string
-  quoteSlippageBorrowedAssetUsd: string
-  quoteTotalFeesFiatUserCurrency: string
-  quoteTotalFeesFiatUsd: string
-  quoteInboundAddress: string
-  quoteMemo: string
-  quoteOutboundDelayMs: number
-  quoteInboundConfirmationMs: number
-  quoteTotalTimeMs: number
-  quoteExpiry: number
-}
-
-export type LendingQuoteClose = {
-  quoteLoanCollateralDecreaseCryptoPrecision: string
-  quoteLoanCollateralDecreaseFiatUserCurrency: string
-  quoteLoanCollateralDecreaseFiatUsd: string
-  quoteDebtRepaidAmountUserCurrency: string
-  quoteDebtRepaidAmountUsd: string
-  quoteWithdrawnAmountAfterFeesCryptoPrecision: string
-  quoteWithdrawnAmountAfterFeesThorBaseUnit: string
-  quoteWithdrawnAmountAfterFeesUserCurrency: string
-  quoteSlippageWithdrawnAssetCryptoPrecision: string
-  quoteTotalFeesFiatUserCurrency: string
-  quoteTotalFeesFiatUsd: string
-  quoteInboundAddress: string
-  quoteMemo: string
-  quoteOutboundDelayMs: number
-  quoteInboundConfirmationMs: number
-  quoteTotalTimeMs: number
-  quoteExpiry: number
-  repaymentAmountCryptoPrecision: string | null
-  repaymentAmountFiatUsd: string | null
-  repaymentAmountFiatUserCurrency: string | null
-  repaymentPercent: number
-}
-
-export const isLendingQuoteOpen = (
-  quote: LendingQuoteOpen | LendingQuoteClose | null,
-): quote is LendingQuoteOpen => Boolean(quote && 'quoteBorrowedAmountCryptoPrecision' in quote)
-
-export const isLendingQuoteClose = (
-  quote: LendingQuoteOpen | LendingQuoteClose | null,
-): quote is LendingQuoteClose => Boolean(quote && 'quoteDebtRepaidAmountUserCurrency' in quote)
diff --git a/src/lib/utils/thorchain/savers.ts b/src/lib/utils/thorchain/savers.ts
new file mode 100644
index 00000000000..77d9038eb1b
--- /dev/null
+++ b/src/lib/utils/thorchain/savers.ts
@@ -0,0 +1,114 @@
+import type { AccountId, AssetId } from '@shapeshiftoss/caip'
+import {
+  avalancheAssetId,
+  bchAssetId,
+  bscAssetId,
+  btcAssetId,
+  cosmosAssetId,
+  dogeAssetId,
+  ethAssetId,
+  fromAccountId,
+  fromAssetId,
+  ltcAssetId,
+} from '@shapeshiftoss/caip'
+import { assetIdToThorPoolAssetId } from '@shapeshiftoss/swapper'
+import axios from 'axios'
+
+import { getAccountAddresses } from '.'
+
+import { getConfig } from '@/config'
+import { queryClient } from '@/context/QueryClientProvider/queryClient'
+import { isUtxoChainId } from '@/lib/utils/utxo'
+
+// Savers vaults are sunset on THORChain, but former savers can still have TCY claims for their
+// positions - these helpers remain solely to introspect those positions for the TCY claim flow.
+
+const usdcEthereumAssetId: AssetId = 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'
+const usdcAvalancheAssetId: AssetId =
+  'eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e'
+const usdtEthereumAssetId: AssetId = 'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7'
+
+const SUPPORTED_THORCHAIN_SAVERS_ASSET_IDS = [
+  cosmosAssetId,
+  avalancheAssetId,
+  ethAssetId,
+  bscAssetId,
+  btcAssetId,
+  bchAssetId,
+  ltcAssetId,
+  dogeAssetId,
+  usdcEthereumAssetId,
+  usdtEthereumAssetId,
+  usdcAvalancheAssetId,
+]
+
+export const isSupportedThorchainSaversAssetId = (assetId: AssetId) =>
+  SUPPORTED_THORCHAIN_SAVERS_ASSET_IDS.includes(assetId)
+
+export type ThorchainSaverPositionResponse = {
+  asset: string
+  asset_address: string
+  last_add_height: number | undefined
+  units: string
+  asset_deposit_value: string
+  asset_redeem_value: string
+  growth_pct: string | undefined
+}
+
+const getAllThorchainSaversPositions = async (
+  assetId: AssetId,
+): Promise<ThorchainSaverPositionResponse[]> => {
+  const poolId = assetIdToThorPoolAssetId({ assetId })
+
+  if (!poolId) return []
+
+  const { data: opportunitiesData } = await queryClient.fetchQuery({
+    queryKey: ['thorchainSaversPositions', poolId],
+    queryFn: () =>
+      axios.get<ThorchainSaverPositionResponse[]>(
+        `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolId}/savers`,
+      ),
+    staleTime: 60_000,
+  })
+
+  if (!opportunitiesData) return []
+
+  return opportunitiesData
+}
+
+export const getThorchainSaversPosition = async ({
+  accountId,
+  assetId,
+}: {
+  accountId: AccountId
+  assetId: AssetId
+}): Promise<ThorchainSaverPositionResponse | null> => {
+  const address = fromAccountId(accountId).account
+  const poolAssetId = assetIdToThorPoolAssetId({ assetId })
+
+  if (!poolAssetId) return null
+
+  if (!isUtxoChainId(fromAssetId(assetId).chainId))
+    return (
+      await axios.get<ThorchainSaverPositionResponse>(
+        `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolAssetId}/saver/${address}`,
+      )
+    ).data
+
+  const allPositions = await getAllThorchainSaversPositions(assetId)
+
+  if (!allPositions.length)
+    throw new Error(`Error fetching THORChain savers positions for assetId: ${assetId}`)
+
+  // Returns either
+  // - A tuple made of a single address for EVM and Cosmos chains since the address *is* the account
+  // - An array of many addresses for UTXOs, since an xpub can derive many many addresses
+  const accountAddresses = await getAccountAddresses(accountId)
+
+  const accountPosition = allPositions.find(
+    ({ asset_address }) =>
+      asset_address === accountAddresses.find(accountAddress => accountAddress === asset_address),
+  )
+
+  return accountPosition ?? null
+}
diff --git a/src/lib/utils/thorchain/types.ts b/src/lib/utils/thorchain/types.ts
index 7161bda293c..d3d6f4f2eba 100644
--- a/src/lib/utils/thorchain/types.ts
+++ b/src/lib/utils/thorchain/types.ts
@@ -76,9 +76,6 @@ export type ThorchainMimir = {
   KEYGENRETRYINTERVAL: number
   KILLSWITCHSTART: number
   L1SLIPMINBPS: number
-  'LENDING-THOR-BTC': number
-  'LENDING-THOR-ETH': number
-  LENDINGLEVER: number
   LIQUIDITYLOCKUPBLOCKS: number
   LOANREPAYMENTMATURITY: number
   LOANSTREAMINGSWAPSINTERVAL: number
@@ -203,7 +200,6 @@ export type ThorchainMimir = {
   TXOUTDELAYRATE: number
   VIRTUALMULTSYNTHS: number
   VOTEDOFM: number
-  VOTELENDING: number
   VOTEMAXSYNTHSFORSAVERSYIELD: number
   [key: string]: unknown
 }
diff --git a/src/pages/Lending/AvailablePools.tsx b/src/pages/Lending/AvailablePools.tsx
deleted file mode 100644
index 8c408545ce6..00000000000
--- a/src/pages/Lending/AvailablePools.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import { CheckCircleIcon } from '@chakra-ui/icons'
-import type { GridProps } from '@chakra-ui/react'
-import { Button, Flex, SimpleGrid, Skeleton, Stack, Tag, TagLeftIcon } from '@chakra-ui/react'
-import type { AssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { useCallback, useMemo } from 'react'
-import { BiErrorCircle } from 'react-icons/bi'
-import { useTranslate } from 'react-polyglot'
-import { useLocation, useNavigate } from 'react-router-dom'
-
-import { LendingHeader } from './components/LendingHeader'
-import { useAllLendingPositionsData } from './hooks/useAllLendingPositionsData'
-import { useIsLendingActive } from './hooks/useIsLendingActive'
-import { useLendingSupportedAssets } from './hooks/useLendingSupportedAssets'
-import { usePoolDataQuery } from './hooks/usePoolDataQuery'
-
-import { Amount } from '@/components/Amount/Amount'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Main } from '@/components/Layout/Main'
-import { SEO } from '@/components/Layout/Seo'
-import { AssetCell } from '@/components/StakingVaults/Cells'
-import { RawText, Text } from '@/components/Text'
-
-export const lendingRowGrid: GridProps['gridTemplateColumns'] = {
-  base: 'minmax(150px, 1fr) repeat(1, minmax(40px, max-content))',
-  lg: '200px repeat(3, 1fr)',
-  xl: '200px repeat(5, 1fr)',
-}
-const mobileDisplay = {
-  base: 'none',
-  lg: 'flex',
-}
-
-const largeDisplay = {
-  base: 'none',
-  xl: 'flex',
-}
-
-const mobilePadding = {
-  base: 4,
-  lg: 4,
-  xl: 0,
-}
-const listMargin = {
-  base: 0,
-  lg: 0,
-  xl: -4,
-}
-
-type LendingPoolButtonProps = {
-  asset: Asset
-  onPoolClick: (assetId: AssetId) => void
-}
-
-const LendingPoolButton = ({ asset, onPoolClick }: LendingPoolButtonProps) => {
-  const usePoolDataArgs = useMemo(() => ({ poolAssetId: asset.assetId }), [asset.assetId])
-  const { data: poolData, isLoading: isPoolDataLoading } = usePoolDataQuery(usePoolDataArgs)
-  const translate = useTranslate()
-  const { isLendingActive, isMimirLoading } = useIsLendingActive()
-
-  const { isLoading: isLendingPositionDataLoading } = useAllLendingPositionsData({
-    assetId: asset.assetId,
-  })
-
-  const isLoaded = useMemo(
-    () => !isPoolDataLoading && !isLendingPositionDataLoading,
-    [isLendingPositionDataLoading, isPoolDataLoading],
-  )
-
-  const StatusTag = useCallback(() => {
-    if ((!isLendingActive && !isMimirLoading) || !poolData?.isAssetLendingEnabled) {
-      return (
-        <Tag colorScheme='red'>
-          <TagLeftIcon as={BiErrorCircle} />
-          {translate('common.halted')}
-        </Tag>
-      )
-    }
-
-    if (poolData?.isHardCapReached || poolData?.currentCapFillPercentage === 100) {
-      return (
-        <Tag colorScheme='yellow'>
-          <TagLeftIcon as={BiErrorCircle} />
-          {translate('common.full')}
-        </Tag>
-      )
-    }
-
-    if (poolData?.isTradingActive) {
-      return (
-        <Tag colorScheme='green'>
-          <TagLeftIcon as={CheckCircleIcon} />
-          {translate('common.active')}
-        </Tag>
-      )
-    }
-
-    return (
-      <Tag colorScheme='red'>
-        <TagLeftIcon as={BiErrorCircle} />
-        {translate('common.halted')}
-      </Tag>
-    )
-  }, [isLendingActive, poolData, translate, isMimirLoading])
-
-  const handlePoolClick = useCallback(() => {
-    onPoolClick(asset.assetId)
-  }, [asset.assetId, onPoolClick])
-  return (
-    <Button
-      variant='ghost'
-      display='grid'
-      gridTemplateColumns={lendingRowGrid}
-      columnGap={4}
-      alignItems='center'
-      textAlign='left'
-      py={4}
-      width='full'
-      height='auto'
-      color='text.base'
-      onClick={handlePoolClick}
-      data-testid={`lending-pool-row-${asset.assetId}`}
-    >
-      <AssetCell assetId={asset.assetId} />
-      <Skeleton isLoaded={isLoaded} display={mobileDisplay}>
-        <Flex>
-          <StatusTag />
-        </Flex>
-      </Skeleton>
-      <Skeleton isLoaded={isLoaded}>
-        <Amount.Fiat value={poolData?.totalDebtUserCurrency ?? '0'} />
-      </Skeleton>
-      <Skeleton isLoaded={isLoaded} display={largeDisplay}>
-        <Amount.Crypto
-          value={poolData?.totalCollateralCryptoPrecision ?? '0'}
-          symbol={asset.symbol}
-        />
-      </Skeleton>
-      <Skeleton isLoaded={isLoaded} display={mobileDisplay}>
-        <Amount.Percent value={poolData?.collateralizationRatioPercentDecimal ?? '0'} />
-      </Skeleton>
-      <Skeleton isLoaded={isLoaded} display={largeDisplay}>
-        <RawText>{poolData?.totalBorrowers ?? '0'}</RawText>
-      </Skeleton>
-    </Button>
-  )
-}
-
-export const AvailablePools = () => {
-  const translate = useTranslate()
-  const navigate = useNavigate()
-  const location = useLocation()
-  const path = location.pathname
-  const handlePoolClick = useCallback(
-    (assetId: AssetId) => {
-      navigate(`${path}/pool/${assetId}`)
-    },
-    [navigate, path],
-  )
-  const headerComponent = useMemo(() => <LendingHeader />, [])
-  const { isLoading: isLendingSupportedAssetsLoading, data: lendingSupportedAssets } =
-    useLendingSupportedAssets({
-      type: 'collateral',
-      statusFilter: 'All',
-    })
-
-  const lendingRows = useMemo(() => {
-    if (isLendingSupportedAssetsLoading)
-      return new Array(2).fill(null).map((_, i) => <Skeleton key={i} height={16} />)
-
-    return (lendingSupportedAssets ?? []).map(asset => (
-      <LendingPoolButton key={asset.assetId} asset={asset} onPoolClick={handlePoolClick} />
-    ))
-  }, [handlePoolClick, isLendingSupportedAssetsLoading, lendingSupportedAssets])
-
-  return (
-    <Main headerComponent={headerComponent} isSubPage data-testid='lending-available-pools'>
-      <SEO title={translate('navBar.lending')} />
-      <Stack>
-        <SimpleGrid
-          gridTemplateColumns={lendingRowGrid}
-          columnGap={4}
-          color='text.subtle'
-          fontWeight='bold'
-          fontSize='sm'
-          px={mobilePadding}
-        >
-          <Text translation='lending.pool' />
-          <Flex display={mobileDisplay}>
-            <HelperTooltip label={translate('lending.statusDescription')}>
-              <Text translation='lending.status' />
-            </HelperTooltip>
-          </Flex>
-          <Flex display={mobileDisplay}>
-            <HelperTooltip label={translate('lending.totalDebtBalanceDescription')}>
-              <Text translation='lending.totalDebtBalance' />
-            </HelperTooltip>
-          </Flex>
-          <HelperTooltip label={translate('lending.totalCollateralDescription')}>
-            <Text translation='lending.totalCollateral' />
-          </HelperTooltip>
-
-          <Flex display={largeDisplay}>
-            <HelperTooltip label={translate('lending.estCollateralizationRatioDescription')}>
-              <Text translation='lending.estCollateralizationRatio' />
-            </HelperTooltip>
-          </Flex>
-          <Flex display={largeDisplay}>
-            <HelperTooltip label={translate('lending.totalBorrowersDescription')}>
-              <Text translation='lending.totalBorrowers' />
-            </HelperTooltip>
-          </Flex>
-        </SimpleGrid>
-        <Stack mx={listMargin}>{lendingRows}</Stack>
-      </Stack>
-    </Main>
-  )
-}
diff --git a/src/pages/Lending/LendingPage.tsx b/src/pages/Lending/LendingPage.tsx
deleted file mode 100644
index de3e5d50d9c..00000000000
--- a/src/pages/Lending/LendingPage.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { GridProps } from '@chakra-ui/react'
-import { Route, Routes } from 'react-router-dom'
-
-import { AvailablePools } from './AvailablePools'
-import { Pool } from './Pool/Pool'
-import { YourLoans } from './YourLoans'
-
-const availablePools = <AvailablePools />
-const yourLoans = <YourLoans />
-const pool = <Pool />
-
-export const lendingRowGrid: GridProps['gridTemplateColumns'] = {
-  base: 'minmax(150px, 1fr) repeat(1, minmax(40px, max-content))',
-  md: '200px repeat(5, 1fr)',
-}
-
-export const LendingPage = () => (
-  <Routes>
-    <Route path={'/'} index element={availablePools} />
-    <Route path={'/poolAccount/*'} element={pool} />
-    <Route path={'/pool/*'} element={pool} />
-    <Route path={'/loans'} element={yourLoans} />
-  </Routes>
-)
diff --git a/src/pages/Lending/Pool/Pool.tsx b/src/pages/Lending/Pool/Pool.tsx
deleted file mode 100644
index e9036df9e3f..00000000000
--- a/src/pages/Lending/Pool/Pool.tsx
+++ /dev/null
@@ -1,444 +0,0 @@
-import type { ResponsiveValue, SkeletonOptions } from '@chakra-ui/react'
-import {
-  Card,
-  CardBody,
-  CardFooter,
-  CardHeader,
-  Flex,
-  Heading,
-  Skeleton,
-  Stack,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-} from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { useMutationState } from '@tanstack/react-query'
-import type { Property } from 'csstype'
-import React, { useCallback, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useLocation, useMatch, useNavigate } from 'react-router-dom'
-
-import { useLendingPositionData } from '../hooks/useLendingPositionData'
-import { useRepaymentLockData } from '../hooks/useRepaymentLockData'
-import { Borrow } from './components/Borrow/Borrow'
-import { Faq } from './components/Faq'
-import { PoolInfo } from './components/PoolInfo'
-import { Repay } from './components/Repay/Repay'
-
-import type { AmountProps } from '@/components/Amount/Amount'
-import { Amount } from '@/components/Amount/Amount'
-import { AssetIcon } from '@/components/AssetIcon'
-import { Display } from '@/components/Display'
-import { DynamicComponent } from '@/components/DynamicComponent'
-import { PageBackButton, PageHeader } from '@/components/Layout/Header/PageHeader'
-import { Main } from '@/components/Layout/Main'
-import { RawText, Text } from '@/components/Text'
-import { BigNumber, bnOrZero } from '@/lib/bignumber/bignumber'
-import type { LendingQuoteClose, LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { isLendingQuoteClose, isLendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { selectAssetById } from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-const tabSelected = { color: 'text.base' }
-const maxWidth = { base: '100%', md: '450px' }
-const responsiveFlex = { base: 'auto', lg: 1 }
-
-type PoolHeaderProps = {
-  assetId?: AssetId
-}
-const PoolHeader: React.FC<PoolHeaderProps> = ({ assetId }) => {
-  const asset = useAppSelector(state => selectAssetById(state, assetId ?? ''))
-  const translate = useTranslate()
-  const navigate = useNavigate()
-  const isPoolPage = useMatch({
-    path: '/lending/pool/*',
-    end: true,
-    caseSensitive: false,
-  })
-  const isPoolAccountPage = useMatch({
-    path: '/lending/poolAccount/*',
-    end: true,
-    caseSensitive: false,
-  })
-
-  const handleBack = useCallback(() => {
-    if (isPoolAccountPage) {
-      navigate('/lending/loans')
-    } else if (isPoolPage) {
-      navigate('/lending')
-    }
-  }, [navigate, isPoolPage, isPoolAccountPage])
-
-  if (!asset) return null
-
-  return (
-    <PageHeader>
-      <PageHeader.Left>
-        <PageBackButton onBack={handleBack} />
-        <Display.Desktop>
-          <PageHeader.Title>{translate('lending.lending')}</PageHeader.Title>
-        </Display.Desktop>
-      </PageHeader.Left>
-      <Display.Mobile>
-        <PageHeader.Middle>
-          <PageHeader.Title>
-            {asset.name} {translate('lending.lending')}
-          </PageHeader.Title>
-        </PageHeader.Middle>
-      </Display.Mobile>
-    </PageHeader>
-  )
-}
-
-const flexDirPool: ResponsiveValue<Property.FlexDirection> = { base: 'column-reverse', lg: 'row' }
-
-// Since dynamic components react on the `value` property, this wrappers ensures the repayment lock
-// component accepts it as a prop, vs. <Skeleton /> being the outermost component if not using a wrapper
-const RepaymentLockComponentWithValue = ({ isLoaded, value }: AmountProps & SkeletonOptions) => {
-  const resolvedValue = BigAmount.isBigAmount(value) ? value.toPrecision() : value
-  const isRepaymentLocked = bnOrZero(resolvedValue).gt(0)
-
-  const translate = useTranslate()
-
-  return (
-    <Skeleton isLoaded={isLoaded}>
-      <RawText color={isRepaymentLocked ? 'white' : 'green.500'} fontSize='2xl' fontWeight='medium'>
-        {isRepaymentLocked
-          ? translate('lending.repaymentDays', { numDays: value })
-          : translate('lending.unlocked')}
-      </RawText>
-    </Skeleton>
-  )
-}
-
-export const Pool = () => {
-  const location = useLocation()
-
-  const { poolAssetId, poolAccountId } = useMemo(() => {
-    if (location.pathname.includes('/poolAccount/')) {
-      const parts = location.pathname.split('/')
-      const accountIdIndex = parts.findIndex(part => part === 'poolAccount') + 1
-      const accountId = parts[accountIdIndex]
-      const assetId = parts.slice(accountIdIndex + 1).join('/') || ''
-      return { poolAssetId: assetId, poolAccountId: accountId }
-    }
-
-    if (location.pathname.includes('/pool/')) {
-      const [, ...rest] = location.pathname.split('/pool/')
-      return { poolAssetId: rest.join('/') || '', poolAccountId: undefined }
-    }
-  }, [location.pathname]) as { poolAssetId: AssetId; poolAccountId: string | undefined }
-
-  const [stepIndex, setStepIndex] = useState<number>(0)
-  const [borrowTxid, setBorrowTxid] = useState<string | null>(null)
-  const [confirmedQuote, setConfirmedQuote] = useState<LendingQuoteOpen | LendingQuoteClose | null>(
-    null,
-  )
-  const [repayTxid, setRepayTxid] = useState<string | null>(null)
-  const [collateralAccountId, setCollateralAccountId] = useState<AccountId | null>(
-    poolAccountId ?? null,
-  )
-  const [borrowAsset, setBorrowAsset] = useState<Asset | null>(null)
-  const [repaymentAsset, setRepaymentAsset] = useState<Asset | null>(null)
-  const [repaymentPercent, setRepaymentPercent] = useState<number>(100)
-  const [depositAmountCryptoPrecision, setDepositAmountCryptoPrecision] = useState<string | null>(
-    null,
-  )
-  const [borrowAccountId, setBorrowAccountId] = useState<AccountId>('')
-  const [repaymentAccountId, setRepaymentAccountId] = useState<AccountId | null>(null)
-
-  const asset = useAppSelector(state => selectAssetById(state, poolAssetId))
-
-  const translate = useTranslate()
-
-  const useRepaymentLockDataArgs = useMemo(
-    () => ({
-      assetId: poolAssetId,
-      accountId: collateralAccountId,
-      // When fetching position repayment lock, we want to ensure there's an AccountId and AssetId
-      // or we would fetch the default network's repayment lock instead
-      enabled: Boolean(poolAssetId && collateralAccountId),
-    }),
-    [collateralAccountId, poolAssetId],
-  )
-  const { data: positionRepaymentLock, isSuccess: isPositionRepaymentLockSuccess } =
-    useRepaymentLockData(useRepaymentLockDataArgs)
-  const { data: defaultRepaymentLock, isSuccess: isDefaultRepaymentLockSuccess } =
-    useRepaymentLockData({})
-
-  const headerComponent = useMemo(() => <PoolHeader assetId={poolAssetId} />, [poolAssetId])
-
-  const borrowMutationStatus = useMutationState({
-    filters: { mutationKey: [borrowTxid] },
-    select: mutation => mutation.state.status,
-  })
-  const isBorrowUpdated = borrowMutationStatus?.[0] === 'success'
-
-  const repayMutationStatus = useMutationState({
-    filters: { mutationKey: [repayTxid] },
-    select: mutation => mutation.state.status,
-  })
-  const isRepayUpdated = repayMutationStatus?.[0] === 'success'
-
-  const { data: lendingPositionData, isLoading: isLendingPositionDataLoading } =
-    useLendingPositionData({
-      assetId: poolAssetId,
-      accountId: collateralAccountId,
-    })
-
-  const collateralBalanceComponent = useMemo(
-    () => (
-      <Amount.Crypto
-        fontSize='2xl'
-        value={lendingPositionData?.collateralBalanceCryptoPrecision ?? '0'}
-        symbol={asset?.symbol ?? ''}
-        fontWeight='medium'
-      />
-    ),
-    [asset?.symbol, lendingPositionData?.collateralBalanceCryptoPrecision],
-  )
-  const newCollateralCrypto = useMemo(() => {
-    if (confirmedQuote && (isBorrowUpdated || isRepayUpdated)) return {}
-
-    if (stepIndex === 0 && lendingPositionData && isLendingQuoteOpen(confirmedQuote))
-      return {
-        newValue: {
-          value: bnOrZero(lendingPositionData?.collateralBalanceCryptoPrecision)
-            .plus(confirmedQuote.quoteCollateralAmountCryptoPrecision)
-            .toFixed(),
-        },
-      }
-    if (stepIndex === 1 && lendingPositionData && isLendingQuoteClose(confirmedQuote))
-      return {
-        newValue: {
-          value: bnOrZero(lendingPositionData?.collateralBalanceCryptoPrecision)
-            .minus(confirmedQuote.quoteLoanCollateralDecreaseCryptoPrecision)
-            .toFixed(),
-        },
-      }
-    return {}
-  }, [confirmedQuote, isBorrowUpdated, isRepayUpdated, stepIndex, lendingPositionData])
-
-  const collateralValueComponent = useMemo(
-    () => (
-      <Amount.Fiat
-        fontSize='2xl'
-        value={lendingPositionData?.collateralBalanceFiatUserCurrency ?? '0'}
-        fontWeight='medium'
-      />
-    ),
-    [lendingPositionData?.collateralBalanceFiatUserCurrency],
-  )
-
-  const newCollateralFiat = useMemo(() => {
-    if (confirmedQuote && (isBorrowUpdated || isRepayUpdated)) return {}
-
-    if (stepIndex === 0 && lendingPositionData && isLendingQuoteOpen(confirmedQuote))
-      return {
-        newValue: {
-          value: bnOrZero(lendingPositionData.collateralBalanceFiatUserCurrency)
-            .plus(confirmedQuote.quoteCollateralAmountFiatUserCurrency)
-            .toFixed(),
-        },
-      }
-    if (stepIndex === 1 && lendingPositionData && isLendingQuoteClose(confirmedQuote))
-      return {
-        newValue: {
-          value: bnOrZero(lendingPositionData.collateralBalanceFiatUserCurrency)
-            .minus(confirmedQuote.quoteLoanCollateralDecreaseFiatUserCurrency)
-            .toFixed(),
-        },
-      }
-
-    return {}
-  }, [confirmedQuote, isBorrowUpdated, isRepayUpdated, lendingPositionData, stepIndex])
-
-  const debtBalanceComponent = useMemo(
-    () => (
-      <Amount.Fiat
-        fontSize='2xl'
-        value={lendingPositionData?.debtBalanceFiatUserCurrency ?? '0'}
-        fontWeight='medium'
-      />
-    ),
-    [lendingPositionData?.debtBalanceFiatUserCurrency],
-  )
-
-  const newDebt = useMemo(() => {
-    if (confirmedQuote && (isBorrowUpdated || isRepayUpdated)) return {}
-
-    if (stepIndex === 0 && lendingPositionData && isLendingQuoteOpen(confirmedQuote))
-      return {
-        newValue: {
-          value: bnOrZero(lendingPositionData.debtBalanceFiatUserCurrency)
-            .plus(confirmedQuote.quoteDebtAmountUserCurrency)
-            .toFixed(),
-        },
-      }
-    if (stepIndex === 1 && lendingPositionData && isLendingQuoteClose(confirmedQuote))
-      return {
-        newValue: {
-          value: BigNumber.max(
-            bnOrZero(lendingPositionData.debtBalanceFiatUserCurrency).minus(
-              confirmedQuote.quoteDebtRepaidAmountUserCurrency,
-            ),
-            0,
-          ).toFixed(),
-        },
-      }
-
-    return {}
-  }, [confirmedQuote, isBorrowUpdated, isRepayUpdated, lendingPositionData, stepIndex])
-
-  const repaymentLockComponent = useMemo(
-    () => (
-      <RepaymentLockComponentWithValue
-        value={positionRepaymentLock ?? '0'}
-        isLoaded={isPositionRepaymentLockSuccess}
-      />
-    ),
-    [isPositionRepaymentLockSuccess, positionRepaymentLock],
-  )
-
-  const newRepaymentLock = useMemo(() => {
-    if (confirmedQuote && (isBorrowUpdated || isRepayUpdated)) return {}
-
-    if (stepIndex === 0 && confirmedQuote && isDefaultRepaymentLockSuccess && defaultRepaymentLock)
-      return {
-        newValue: {
-          value: defaultRepaymentLock,
-        },
-      }
-    return {}
-  }, [
-    confirmedQuote,
-    isBorrowUpdated,
-    isRepayUpdated,
-    stepIndex,
-    isDefaultRepaymentLockSuccess,
-    defaultRepaymentLock,
-  ])
-
-  return (
-    <Main headerComponent={headerComponent} isSubPage data-testid='lending-pool-detail'>
-      <Flex gap={4} flexDir={flexDirPool}>
-        <Stack gap={6} flex={1}>
-          <Card>
-            <CardHeader px={8} py={8}>
-              <Flex gap={4} alignItems='center'>
-                <AssetIcon assetId={poolAssetId} />
-                <Heading as='h3'>{asset?.name ?? ''}</Heading>
-              </Flex>
-            </CardHeader>
-            <CardBody gap={8} display='flex' flexDir='column' px={8} pb={8} pt={0}>
-              <Text translation='lending.myLoanInformation' fontWeight='medium' />
-              <Flex gap={4} flexWrap='wrap'>
-                <DynamicComponent
-                  label='lending.collateralBalance'
-                  toolTipLabel={translate('lending.collateralBalanceDescription')}
-                  component={collateralBalanceComponent}
-                  isLoading={isLendingPositionDataLoading}
-                  flex={responsiveFlex}
-                  {...newCollateralCrypto}
-                />
-                <DynamicComponent
-                  label='lending.collateralValue'
-                  toolTipLabel={translate('lending.collateralValueDescription')}
-                  component={collateralValueComponent}
-                  isLoading={isLendingPositionDataLoading}
-                  flex={responsiveFlex}
-                  {...newCollateralFiat}
-                />
-              </Flex>
-              <Flex gap={4} flexWrap='wrap'>
-                <DynamicComponent
-                  label='lending.debtBalance'
-                  toolTipLabel={translate('lending.debtBalanceDescription')}
-                  component={debtBalanceComponent}
-                  isLoading={isLendingPositionDataLoading}
-                  flex={responsiveFlex}
-                  {...newDebt}
-                />
-                <DynamicComponent
-                  label='lending.repaymentLock'
-                  toolTipLabel={translate('lending.repaymentLockDescription')}
-                  component={repaymentLockComponent}
-                  isLoading={isLendingPositionDataLoading}
-                  flex={responsiveFlex}
-                  {...newRepaymentLock}
-                />
-              </Flex>
-            </CardBody>
-            <CardFooter
-              gap={8}
-              display='flex'
-              flexDir='column'
-              px={8}
-              py={8}
-              borderTopWidth={1}
-              borderColor='border.base'
-            >
-              <PoolInfo poolAssetId={poolAssetId} />
-            </CardFooter>
-          </Card>
-          <Faq />
-        </Stack>
-        <Stack flex={1} maxWidth={maxWidth}>
-          <Card>
-            <Tabs onChange={setStepIndex} variant='unstyled'>
-              <TabList px={2} py={4}>
-                <Tab color='text.subtle' fontWeight='bold' _selected={tabSelected}>
-                  {translate('lending.borrow')}
-                </Tab>
-                <Tab color='text.subtle' fontWeight='bold' _selected={tabSelected}>
-                  {translate('lending.repay')}
-                </Tab>
-              </TabList>
-              <TabPanels>
-                <TabPanel px={0} py={0}>
-                  <Borrow
-                    isAccountSelectionDisabled={Boolean(poolAccountId)}
-                    borrowAsset={borrowAsset}
-                    setBorrowAsset={setBorrowAsset}
-                    collateralAccountId={collateralAccountId ?? ''}
-                    depositAmountCryptoPrecision={depositAmountCryptoPrecision}
-                    setCryptoDepositAmount={setDepositAmountCryptoPrecision}
-                    borrowAccountId={borrowAccountId}
-                    onCollateralAccountIdChange={setCollateralAccountId}
-                    onBorrowAccountIdChange={setBorrowAccountId}
-                    txId={borrowTxid}
-                    setTxid={setBorrowTxid}
-                    confirmedQuote={isLendingQuoteOpen(confirmedQuote) ? confirmedQuote : null}
-                    setConfirmedQuote={setConfirmedQuote}
-                  />
-                </TabPanel>
-                <TabPanel px={0} py={0}>
-                  <Repay
-                    isAccountSelectionDisabled={Boolean(poolAccountId)}
-                    collateralAccountId={collateralAccountId}
-                    repaymentAsset={repaymentAsset}
-                    repaymentPercent={repaymentPercent}
-                    setRepaymentPercent={setRepaymentPercent}
-                    setRepaymentAsset={setRepaymentAsset}
-                    repaymentAccountId={repaymentAccountId}
-                    onCollateralAccountIdChange={setCollateralAccountId}
-                    onRepaymentAccountIdChange={setRepaymentAccountId}
-                    txId={repayTxid}
-                    setTxid={setRepayTxid}
-                    confirmedQuote={isLendingQuoteClose(confirmedQuote) ? confirmedQuote : null}
-                    setConfirmedQuote={setConfirmedQuote}
-                  />
-                </TabPanel>
-              </TabPanels>
-            </Tabs>
-          </Card>
-        </Stack>
-      </Flex>
-    </Main>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Borrow/Borrow.tsx b/src/pages/Lending/Pool/components/Borrow/Borrow.tsx
deleted file mode 100644
index 8a00fe326cb..00000000000
--- a/src/pages/Lending/Pool/components/Borrow/Borrow.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { AnimatePresence } from 'framer-motion'
-import { lazy, memo, Suspense, useCallback, useMemo, useState } from 'react'
-import { MemoryRouter, useLocation } from 'react-router-dom'
-import { Route, Switch } from 'wouter'
-
-import { BorrowRoutePaths } from './types'
-
-import { useRouteAssetId } from '@/hooks/useRouteAssetId/useRouteAssetId'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import type { LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { selectMarketDataByAssetIdUserCurrency } from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-const BorrowInput = lazy(() =>
-  import('./BorrowInput').then(({ BorrowInput }) => ({ default: BorrowInput })),
-)
-const BorrowSweep = lazy(() =>
-  import('./BorrowSweep').then(({ BorrowSweep }) => ({ default: BorrowSweep })),
-)
-const BorrowConfirm = lazy(() =>
-  import('./BorrowConfirm').then(({ BorrowConfirm }) => ({ default: BorrowConfirm })),
-)
-
-const BorrowEntries = [BorrowRoutePaths.Input, BorrowRoutePaths.Confirm]
-
-const suspenseFallback = <div>Loading...</div>
-
-type BorrowProps = {
-  isAccountSelectionDisabled?: boolean
-  collateralAccountId: AccountId
-  borrowAccountId: AccountId
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onBorrowAccountIdChange: (accountId: AccountId) => void
-  depositAmountCryptoPrecision: string | null
-  setCryptoDepositAmount: (amount: string | null) => void
-  borrowAsset: Asset | null
-  setBorrowAsset: (asset: Asset | null) => void
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteOpen | null
-  setConfirmedQuote: (quote: LendingQuoteOpen | null) => void
-}
-export const Borrow = ({
-  borrowAsset,
-  isAccountSelectionDisabled,
-  setBorrowAsset,
-  collateralAccountId,
-  borrowAccountId,
-  onCollateralAccountIdChange: handleCollateralAccountIdChange,
-  onBorrowAccountIdChange: handleBorrowAccountIdChange,
-  depositAmountCryptoPrecision,
-  setCryptoDepositAmount,
-  txId,
-  setTxid,
-  confirmedQuote,
-  setConfirmedQuote,
-}: BorrowProps) => {
-  const [fiatDepositAmount, setFiatDepositAmount] = useState<string | null>(null)
-
-  const collateralAssetId = useRouteAssetId()
-
-  const collateralAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, collateralAssetId),
-  )
-  const handleDepositAmountChange = useCallback(
-    (value: string, isFiat?: boolean) => {
-      const crypto = (() => {
-        if (!isFiat) return value
-        const valueCryptoPrecision = bnOrZero(value)
-          .div(bnOrZero(collateralAssetMarketData?.price))
-          .toFixed()
-        return valueCryptoPrecision
-      })()
-      const fiat = (() => {
-        if (isFiat) return value
-        const valueFiatUserCurrency = bnOrZero(value)
-          .times(bnOrZero(collateralAssetMarketData?.price))
-          .toFixed()
-        return valueFiatUserCurrency
-      })()
-
-      setCryptoDepositAmount(crypto)
-      setFiatDepositAmount(fiat)
-    },
-    [collateralAssetMarketData?.price, setCryptoDepositAmount],
-  )
-
-  return (
-    <MemoryRouter initialEntries={BorrowEntries} initialIndex={0}>
-      <BorrowRoutes
-        borrowAsset={borrowAsset}
-        setBorrowAsset={setBorrowAsset}
-        collateralAssetId={collateralAssetId}
-        cryptoDepositAmount={depositAmountCryptoPrecision}
-        setDepositAmount={setCryptoDepositAmount}
-        fiatDepositAmount={fiatDepositAmount}
-        onDepositAmountChange={handleDepositAmountChange}
-        collateralAccountId={collateralAccountId}
-        borrowAccountId={borrowAccountId}
-        isAccountSelectionDisabled={isAccountSelectionDisabled}
-        onCollateralAccountIdChange={handleCollateralAccountIdChange}
-        onBorrowAccountIdChange={handleBorrowAccountIdChange}
-        txId={txId}
-        setTxid={setTxid}
-        confirmedQuote={confirmedQuote}
-        setConfirmedQuote={setConfirmedQuote}
-      />
-    </MemoryRouter>
-  )
-}
-
-type BorrowRoutesProps = {
-  borrowAsset: Asset | null
-  setBorrowAsset: (asset: Asset | null) => void
-  collateralAssetId: AssetId
-  cryptoDepositAmount: string | null
-  setDepositAmount: (amount: string | null) => void
-  fiatDepositAmount: string | null
-  onDepositAmountChange: (value: string, isFiat?: boolean) => void
-  isAccountSelectionDisabled?: boolean
-  collateralAccountId: AccountId
-  borrowAccountId: AccountId
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onBorrowAccountIdChange: (accountId: AccountId) => void
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteOpen | null
-  setConfirmedQuote: (quote: LendingQuoteOpen | null) => void
-}
-
-const BorrowRoutes = memo(
-  ({
-    borrowAsset,
-    setBorrowAsset,
-    collateralAssetId,
-    cryptoDepositAmount,
-    setDepositAmount,
-    fiatDepositAmount,
-    isAccountSelectionDisabled,
-    onDepositAmountChange,
-    collateralAccountId,
-    borrowAccountId,
-    onCollateralAccountIdChange: handleCollateralAccountIdChange,
-    onBorrowAccountIdChange: handleBorrowAccountIdChange,
-    txId,
-    setTxid,
-    confirmedQuote,
-    setConfirmedQuote,
-  }: BorrowRoutesProps) => {
-    const location = useLocation()
-
-    const borrowInput = useMemo(
-      () => (
-        <BorrowInput
-          isAccountSelectionDisabled={isAccountSelectionDisabled}
-          collateralAssetId={collateralAssetId}
-          depositAmountCryptoPrecision={cryptoDepositAmount}
-          fiatDepositAmount={fiatDepositAmount}
-          collateralAccountId={collateralAccountId}
-          borrowAccountId={borrowAccountId}
-          onCollateralAccountIdChange={handleCollateralAccountIdChange}
-          onBorrowAccountIdChange={handleBorrowAccountIdChange}
-          onDepositAmountChange={onDepositAmountChange}
-          borrowAsset={borrowAsset}
-          setBorrowAsset={setBorrowAsset}
-          confirmedQuote={confirmedQuote}
-          setConfirmedQuote={setConfirmedQuote}
-        />
-      ),
-      [
-        isAccountSelectionDisabled,
-        collateralAssetId,
-        cryptoDepositAmount,
-        fiatDepositAmount,
-        collateralAccountId,
-        borrowAccountId,
-        handleCollateralAccountIdChange,
-        handleBorrowAccountIdChange,
-        onDepositAmountChange,
-        borrowAsset,
-        setBorrowAsset,
-        confirmedQuote,
-        setConfirmedQuote,
-      ],
-    )
-
-    const borrowSweep = useMemo(
-      () => (
-        <BorrowSweep
-          collateralAssetId={collateralAssetId}
-          collateralAccountId={collateralAccountId}
-        />
-      ),
-      [collateralAssetId, collateralAccountId],
-    )
-
-    const borrowConfirm = useMemo(
-      () => (
-        <BorrowConfirm
-          collateralAssetId={collateralAssetId}
-          depositAmount={cryptoDepositAmount}
-          setDepositAmount={setDepositAmount}
-          borrowAccountId={borrowAccountId}
-          collateralAccountId={collateralAccountId}
-          borrowAsset={borrowAsset}
-          txId={txId}
-          setTxid={setTxid}
-          confirmedQuote={confirmedQuote}
-          setConfirmedQuote={setConfirmedQuote}
-        />
-      ),
-      [
-        collateralAssetId,
-        cryptoDepositAmount,
-        setDepositAmount,
-        borrowAccountId,
-        collateralAccountId,
-        borrowAsset,
-        txId,
-        setTxid,
-        confirmedQuote,
-        setConfirmedQuote,
-      ],
-    )
-
-    return (
-      <AnimatePresence mode='wait' initial={false}>
-        <Suspense fallback={suspenseFallback}>
-          <Switch location={location.pathname}>
-            <Route key={BorrowRoutePaths.Input} path={BorrowRoutePaths.Input}>
-              {borrowInput}
-            </Route>
-            <Route key={BorrowRoutePaths.Sweep} path={BorrowRoutePaths.Sweep}>
-              {borrowSweep}
-            </Route>
-            <Route key={BorrowRoutePaths.Confirm} path={BorrowRoutePaths.Confirm}>
-              {borrowConfirm}
-            </Route>
-          </Switch>
-        </Suspense>
-      </AnimatePresence>
-    )
-  },
-)
diff --git a/src/pages/Lending/Pool/components/Borrow/BorrowConfirm.tsx b/src/pages/Lending/Pool/components/Borrow/BorrowConfirm.tsx
deleted file mode 100644
index b8dc00feddd..00000000000
--- a/src/pages/Lending/Pool/components/Borrow/BorrowConfirm.tsx
+++ /dev/null
@@ -1,563 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Box,
-  Button,
-  CardFooter,
-  CardHeader,
-  Divider,
-  Flex,
-  Heading,
-  Progress,
-  Skeleton,
-  Stack,
-  useInterval,
-} from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAssetId } from '@shapeshiftoss/caip'
-import { FeeDataKey, isEvmChainId } from '@shapeshiftoss/chain-adapters'
-import { isLedger } from '@shapeshiftoss/hdwallet-ledger'
-import type { Asset, KnownChainIds } from '@shapeshiftoss/types'
-import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { useMutation, useMutationState } from '@tanstack/react-query'
-import dayjs from 'dayjs'
-import prettyMilliseconds from 'pretty-ms'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-import { toHex } from 'viem'
-
-import { LoanSummary } from '../LoanSummary'
-import { BorrowRoutePaths } from './types'
-
-import { Amount } from '@/components/Amount/Amount'
-import { AssetToAsset } from '@/components/AssetToAsset/AssetToAsset'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import type { SendInput } from '@/components/Modals/Send/Form'
-import { handleSend } from '@/components/Modals/Send/utils'
-import { WithBackButton } from '@/components/MultiHopTrade/components/WithBackButton'
-import { Row } from '@/components/Row/Row'
-import { SlideTransition } from '@/components/SlideTransition'
-import { RawText, Text } from '@/components/Text'
-import { getChainAdapterManager } from '@/context/PluginProvider/chainAdapterSingleton'
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { getMaybeCompositeAssetSymbol } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { getSupportedEvmChainIds } from '@/lib/utils/evm'
-import { getThorchainFromAddress, waitForThorchainUpdate } from '@/lib/utils/thorchain'
-import { getThorchainLendingPosition } from '@/lib/utils/thorchain/lending'
-import type { LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { useLendingQuoteOpenQuery } from '@/pages/Lending/hooks/useLendingQuoteQuery'
-import { useQuoteEstimatedFeesQuery } from '@/react-queries/hooks/useQuoteEstimatedFeesQuery'
-import { preferences } from '@/state/slices/preferencesSlice/preferencesSlice'
-import {
-  selectAssetById,
-  selectAssets,
-  selectFeeAssetById,
-  selectMarketDataByAssetIdUserCurrency,
-  selectPortfolioAccountMetadataByAccountId,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type BorrowConfirmProps = {
-  collateralAssetId: AssetId
-  depositAmount: string | null
-  setDepositAmount: (amount: string | null) => void
-  collateralAccountId: AccountId
-  borrowAccountId: AccountId
-  borrowAsset: Asset | null
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteOpen | null
-  setConfirmedQuote: (quote: LendingQuoteOpen | null) => void
-}
-
-export const BorrowConfirm = ({
-  collateralAssetId,
-  depositAmount,
-  collateralAccountId,
-  borrowAccountId,
-  borrowAsset,
-  txId,
-  setTxid,
-  confirmedQuote,
-  setConfirmedQuote,
-  setDepositAmount,
-}: BorrowConfirmProps) => {
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const borrowAssetId = borrowAsset?.assetId ?? ''
-  const navigate = useNavigate()
-  const translate = useTranslate()
-
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-  const debtAsset = useAppSelector(state => selectAssetById(state, borrowAssetId))
-  const collateralFeeAsset = useAppSelector(state => selectFeeAssetById(state, collateralAssetId))
-  const borrowFeeAsset = useAppSelector(state =>
-    selectFeeAssetById(state, borrowAsset?.assetId ?? ''),
-  )
-
-  const collateralAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, collateralAssetId),
-  )
-  const { mutateAsync } = useMutation({
-    mutationKey: [txId],
-    mutationFn: async ({
-      txId: _txId,
-      expectedCompletionTime,
-    }: {
-      txId: string
-      expectedCompletionTime?: number
-    }) => {
-      // Ensuring we wait for the outbound Tx to exist
-      // Else, the position will update before the borrowed asset is received and users will be confused
-      await waitForThorchainUpdate({ txId: _txId, skipOutbound: false, expectedCompletionTime })
-        .promise
-      queryClient.invalidateQueries({ queryKey: ['thorchainLendingPosition'], exact: false })
-    },
-  })
-
-  const [isLoanPending, setIsLoanPending] = useState(false)
-  const [isQuoteExpired, setIsQuoteExpired] = useState(false)
-  const [elapsedTime, setElapsedTime] = useState(0)
-
-  const lendingMutationStatus = useMutationState({
-    filters: { mutationKey: [txId] },
-    select: mutation => mutation.state.status,
-  })
-
-  const lendingMutationSubmittedAt = useMutationState({
-    filters: { mutationKey: [txId] },
-    select: mutation => mutation.state.submittedAt,
-  })
-
-  const loanTxStatus = useMemo(() => lendingMutationStatus?.[0], [lendingMutationStatus])
-
-  const swapStatus = useMemo(() => {
-    if (loanTxStatus === 'success') return TxStatus.Confirmed
-    if (loanTxStatus === 'pending') return TxStatus.Pending
-    return TxStatus.Unknown
-  }, [loanTxStatus])
-
-  const mixpanel = getMixPanel()
-  const eventData = useMemo(() => {
-    if (!confirmedQuote) return {}
-
-    const assets = selectAssets(store.getState())
-    const compositeBorrowAsset = getMaybeCompositeAssetSymbol(borrowAsset?.assetId ?? '', assets)
-    const compositeCollateralAsset = getMaybeCompositeAssetSymbol(collateralAssetId ?? '', assets)
-
-    return {
-      borrowAsset: compositeBorrowAsset,
-      collateralAsset: compositeCollateralAsset,
-      borrowAssetChain: borrowFeeAsset?.networkName,
-      collateralAssetChain: collateralFeeAsset?.networkName,
-      totalFeesUserCurrency: bn(confirmedQuote.quoteTotalFeesFiatUserCurrency).toFixed(2),
-      totalFeesUsd: bn(confirmedQuote.quoteTotalFeesFiatUsd).toFixed(2),
-      depositAmountCryptoPrecision: depositAmount,
-      collateralAmountCryptoPrecision: confirmedQuote.quoteCollateralAmountCryptoPrecision,
-      collateralAmountUserCurrency: bn(
-        confirmedQuote.quoteCollateralAmountFiatUserCurrency,
-      ).toFixed(2),
-      collateralAmountUsd: bn(confirmedQuote.quoteCollateralAmountFiatUsd).toFixed(2),
-      borrowedAmountUserCurrency: bn(confirmedQuote.quoteBorrowedAmountUserCurrency).toFixed(2),
-      borrowedAmountUsd: bn(confirmedQuote.quoteBorrowedAmountUsd).toFixed(2),
-      borrowedAmountCryptoPrecision: confirmedQuote.quoteBorrowedAmountCryptoPrecision,
-      debtAmountUserCurrency: bn(confirmedQuote.quoteDebtAmountUserCurrency).toFixed(2),
-      debtAmountUsd: bn(confirmedQuote.quoteDebtAmountUsd).toFixed(2),
-    }
-  }, [
-    borrowAsset?.assetId,
-    borrowFeeAsset?.networkName,
-    collateralAssetId,
-    collateralFeeAsset?.networkName,
-    confirmedQuote,
-    depositAmount,
-  ])
-
-  useEffect(() => {
-    // don't start polling until we have a tx
-    if (!txId) return
-    if (!confirmedQuote) return
-    ;(async () => {
-      const expectedCompletionTime = dayjs()
-        .add(confirmedQuote.quoteTotalTimeMs, 'millisecond')
-        .unix()
-      await mutateAsync({ txId, expectedCompletionTime })
-      mixpanel?.track(MixPanelEvent.BorrowSuccess, eventData)
-      setIsLoanPending(false)
-    })()
-  }, [confirmedQuote, eventData, mixpanel, mutateAsync, txId])
-
-  const handleBack = useCallback(() => {
-    navigate(BorrowRoutePaths.Input)
-  }, [navigate])
-
-  const divider = useMemo(() => <Divider />, [])
-
-  const chainAdapter = getChainAdapterManager().get(fromAssetId(collateralAssetId).chainId)
-
-  const selectedCurrency = useAppSelector(preferences.selectors.selectSelectedCurrency)
-
-  const {
-    data: estimatedFeesData,
-    isSuccess: isEstimatedFeesDataSuccess,
-    isLoading: isEstimatedFeesDataLoading,
-    isError: isEstimatedFeesDataError,
-  } = useQuoteEstimatedFeesQuery({
-    collateralAssetId,
-    collateralAccountId,
-    depositAmountCryptoPrecision: depositAmount ?? '0',
-    confirmedQuote,
-  })
-
-  const useLendingQuoteQueryArgs = useMemo(
-    () => ({
-      // Refetching at confirm step should only be done programmatically with refetch if a quote expires and a user clicks "Refetch Quote"
-      enabled: false,
-      collateralAssetId,
-      collateralAccountId,
-      borrowAccountId,
-      borrowAssetId: borrowAsset?.assetId ?? '',
-      depositAmountCryptoPrecision: depositAmount ?? '0',
-    }),
-    [borrowAccountId, borrowAsset?.assetId, collateralAccountId, collateralAssetId, depositAmount],
-  )
-
-  const { refetch: refetchLendingQuote, isRefetching: isLendingQuoteRefetching } =
-    useLendingQuoteOpenQuery(useLendingQuoteQueryArgs)
-
-  const isLendingQuoteSuccess = Boolean(confirmedQuote)
-
-  const collateralAccountFilter = useMemo(
-    () => ({ accountId: collateralAccountId }),
-    [collateralAccountId],
-  )
-  const collateralAccountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, collateralAccountFilter),
-  )
-
-  const handleConfirm = useCallback(async () => {
-    if (!confirmedQuote) return
-
-    if (isQuoteExpired) {
-      const { data: refetchedQuote } = await refetchLendingQuote()
-      setConfirmedQuote(refetchedQuote ?? null)
-      return
-    }
-
-    if (loanTxStatus === 'pending') return // no-op
-
-    if (loanTxStatus === 'success') {
-      // Reset values when going back to input step
-      setTxid(null)
-      setConfirmedQuote(null)
-      setDepositAmount(null)
-      return navigate(BorrowRoutePaths.Input)
-    }
-
-    if (
-      !(
-        collateralAssetId &&
-        depositAmount &&
-        wallet &&
-        chainAdapter &&
-        isLendingQuoteSuccess &&
-        isEstimatedFeesDataSuccess &&
-        collateralAccountMetadata &&
-        borrowAsset &&
-        collateralAsset
-      )
-    )
-      return
-
-    setIsLoanPending(true)
-
-    mixpanel?.track(MixPanelEvent.BorrowConfirm, eventData)
-
-    const from = await getThorchainFromAddress({
-      accountId: collateralAccountId,
-      getPosition: getThorchainLendingPosition,
-      assetId: collateralAssetId,
-      wallet,
-      accountMetadata: collateralAccountMetadata,
-    })
-    if (!from) throw new Error(`Could not get send address for AccountId ${collateralAccountId}`)
-    const supportedEvmChainIds = getSupportedEvmChainIds()
-    const { estimatedFees } = estimatedFeesData
-    const maybeTxId = await (() => {
-      // TODO(gomes): isTokenDeposit. This doesn't exist yet but may in the future.
-      const sendInput: SendInput = {
-        amountCryptoPrecision: depositAmount ?? '0',
-        assetId: collateralAssetId,
-        to: confirmedQuote.quoteInboundAddress,
-        from,
-        sendMax: false,
-        accountId: collateralAccountId,
-        memo: supportedEvmChainIds.includes(fromAssetId(collateralAssetId).chainId as KnownChainIds)
-          ? toHex(confirmedQuote.quoteMemo)
-          : confirmedQuote.quoteMemo,
-        amountFieldError: '',
-        estimatedFees,
-        feeType: FeeDataKey.Fast,
-        fiatAmount: '',
-        fiatSymbol: selectedCurrency,
-        vanityAddress: '',
-        input: confirmedQuote.quoteInboundAddress,
-      }
-
-      if (!sendInput) throw new Error('Error building send input')
-
-      return handleSend({ sendInput, wallet })
-    })()
-
-    if (!maybeTxId) {
-      throw new Error('Error sending THORCHain lending Txs')
-    }
-
-    setTxid(maybeTxId)
-
-    return maybeTxId
-  }, [
-    confirmedQuote,
-    isQuoteExpired,
-    loanTxStatus,
-    collateralAssetId,
-    depositAmount,
-    wallet,
-    chainAdapter,
-    isLendingQuoteSuccess,
-    isEstimatedFeesDataSuccess,
-    collateralAccountMetadata,
-    borrowAsset,
-    collateralAsset,
-    mixpanel,
-    eventData,
-    collateralAccountId,
-    estimatedFeesData,
-    setTxid,
-    refetchLendingQuote,
-    setConfirmedQuote,
-    setDepositAmount,
-    navigate,
-    selectedCurrency,
-  ])
-
-  // Quote expiration interval
-  useInterval(() => {
-    // This should never happen but it may
-    if (!confirmedQuote) return
-
-    // Since we run this interval check every second, subtract a few seconds to avoid
-    // off-by-one on the last second as well as the main thread being overloaded and running slow
-    const quoteExpiryUnix = dayjs.unix(confirmedQuote.quoteExpiry).subtract(5, 'second').unix()
-
-    const isExpired = dayjs.unix(quoteExpiryUnix).isBefore(dayjs())
-    setIsQuoteExpired(isExpired)
-  }, 1000)
-
-  // Elapsed time interval
-  useInterval(() => {
-    if (!loanTxStatus || !txId || !confirmedQuote) return
-    if (!lendingMutationSubmittedAt[0]) return
-
-    const submittedAt = lendingMutationSubmittedAt[0]
-    const newElapsedTime = dayjs().diff(dayjs(submittedAt))
-
-    if (newElapsedTime >= confirmedQuote.quoteTotalTimeMs) {
-      setElapsedTime(confirmedQuote.quoteTotalTimeMs)
-    } else {
-      setElapsedTime(newElapsedTime)
-    }
-  }, 1000)
-  const confirmTranslation = useMemo(() => {
-    if (isQuoteExpired) return 'lending.refetchQuote'
-
-    return loanTxStatus === 'success' ? 'lending.borrowAgain' : 'lending.confirmAndBorrow'
-  }, [isQuoteExpired, loanTxStatus])
-
-  const maybeLedgerOpenAppWarning = useMemo(() => {
-    if (!wallet || !isLedger(wallet)) return null
-
-    const chain = (() => {
-      if (!chainAdapter) return ''
-      // All EVM chains are managed using the Ethereum app on Ledger
-      if (isEvmChainId(fromAssetId(collateralAssetId).chainId)) return 'Ethereum'
-      return chainAdapter?.getDisplayName()
-    })()
-
-    return (
-      <Alert status='info'>
-        <AlertIcon />
-        <AlertDescription>
-          <Text
-            // eslint is drunk, this whole JSX expression is already memoized
-            translation={['walletProvider.ledger.signWarning', { chain }]}
-          />
-        </AlertDescription>
-      </Alert>
-    )
-  }, [chainAdapter, collateralAssetId, wallet])
-
-  if (!depositAmount || !chainAdapter) return null
-
-  return (
-    <SlideTransition>
-      <Flex flexDir='column' width='full' data-testid='lending-borrow-confirm'>
-        <CardHeader>
-          <WithBackButton onBack={handleBack}>
-            <Heading as='h5' textAlign='center'>
-              <Text translation='Confirm' />
-            </Heading>
-          </WithBackButton>
-        </CardHeader>
-        <Stack spacing={0} divider={divider}>
-          <Stack spacing={0} pb={4}>
-            <AssetToAsset
-              buyIcon={debtAsset?.icon ?? ''}
-              sellIcon={collateralAsset?.icon ?? ''}
-              buyColor={debtAsset?.color ?? ''}
-              sellColor={collateralAsset?.color ?? ''}
-              status={swapStatus}
-              px={6}
-              mb={4}
-            />
-            <Flex px={6}>
-              <Progress
-                width='full'
-                borderRadius='full'
-                size='sm'
-                min={0}
-                max={confirmedQuote?.quoteTotalTimeMs ?? 0}
-                value={elapsedTime}
-                hasStripe
-                isAnimated={loanTxStatus === 'pending'}
-                colorScheme={loanTxStatus === 'success' ? 'green' : 'blue'}
-              />
-            </Flex>
-          </Stack>
-          <Stack py={4} spacing={4} px={6} fontSize='sm' fontWeight='medium'>
-            <RawText fontWeight='bold'>{translate('lending.transactionInfo')}</RawText>
-            <Row>
-              <Row.Label>{translate('common.send')}</Row.Label>
-              <Row.Value textAlign='right'>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <Stack spacing={1} flexDir='row' flexWrap='wrap'>
-                    <Amount.Crypto value={depositAmount} symbol={collateralAsset?.symbol ?? ''} />
-                    <Amount.Fiat
-                      color='text.subtle'
-                      value={bnOrZero(depositAmount)
-                        .times(bnOrZero(collateralAssetMarketData?.price))
-                        .toString()}
-                      prefix='≈'
-                    />
-                  </Stack>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row>
-              <Row.Label>{translate('common.receive')}</Row.Label>
-              <Row.Value textAlign='right'>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <Stack spacing={1} flexDir='row' flexWrap='wrap'>
-                    <Amount.Crypto
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.quoteBorrowedAmountCryptoPrecision ?? '0'}
-                      symbol={debtAsset?.symbol ?? ''}
-                    />
-                    <Amount.Fiat
-                      color='text.subtle'
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.quoteBorrowedAmountUserCurrency ?? '0'}
-                      prefix='≈'
-                    />
-                  </Stack>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <HelperTooltip label={translate('lending.quote.feesPlusSlippage')}>
-                <Row.Label>{translate('common.feesPlusSlippage')}</Row.Label>
-              </HelperTooltip>
-              <Row.Value>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  {/* Actually defined at display time, see isLoaded above */}
-                  <Amount.Fiat value={confirmedQuote?.quoteTotalFeesFiatUserCurrency ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('common.gasFee')}</Row.Label>
-              <Row.Value>
-                <Skeleton
-                  isLoaded={
-                    isEstimatedFeesDataSuccess && isLendingQuoteSuccess && !isLendingQuoteRefetching
-                  }
-                >
-                  {/* Actually defined at display time, see isLoaded above */}
-                  <Amount.Fiat value={estimatedFeesData?.txFeeFiat ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <RawText fontWeight='bold'>
-                    {prettyMilliseconds(confirmedQuote?.quoteTotalTimeMs ?? 0)}
-                  </RawText>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-          </Stack>
-          <LoanSummary
-            confirmedQuote={confirmedQuote}
-            borderTopWidth={0}
-            mt={0}
-            collateralAssetId={collateralAssetId}
-            collateralAccountId={collateralAccountId}
-            debtOccuredAmountUserCurrency={confirmedQuote?.quoteDebtAmountUserCurrency ?? '0'}
-            borrowAssetId={borrowAssetId}
-            borrowAccountId={borrowAccountId}
-            depositAmountCryptoPrecision={depositAmount ?? '0'}
-          />
-          <CardFooter px={4} py={4}>
-            <Stack spacing={4} width='full'>
-              {maybeLedgerOpenAppWarning && <Box width='full'>{maybeLedgerOpenAppWarning}</Box>}
-              <Box width='full'>
-                <Button
-                  colorScheme='blue'
-                  size='lg'
-                  width='full'
-                  onClick={handleConfirm}
-                  isLoading={
-                    isLoanPending ||
-                    isLendingQuoteRefetching ||
-                    loanTxStatus === 'pending' ||
-                    isEstimatedFeesDataLoading ||
-                    !confirmedQuote
-                  }
-                  disabled={
-                    loanTxStatus === 'pending' ||
-                    isLoanPending ||
-                    isEstimatedFeesDataLoading ||
-                    isEstimatedFeesDataError ||
-                    !confirmedQuote
-                  }
-                >
-                  {translate(confirmTranslation)}
-                </Button>
-              </Box>
-            </Stack>
-          </CardFooter>
-        </Stack>
-      </Flex>
-    </SlideTransition>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx b/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
deleted file mode 100644
index 2a3fb6666d5..00000000000
--- a/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
+++ /dev/null
@@ -1,703 +0,0 @@
-import { ArrowDownIcon } from '@chakra-ui/icons'
-import {
-  Button,
-  CardFooter,
-  Collapse,
-  Divider,
-  Flex,
-  IconButton,
-  Skeleton,
-  Stack,
-} from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAccountId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import prettyMilliseconds from 'pretty-ms'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import { LoanSummary } from '../LoanSummary'
-import { BorrowRoutePaths } from './types'
-
-import { WarningAcknowledgement } from '@/components/Acknowledgement/WarningAcknowledgement'
-import { Amount } from '@/components/Amount/Amount'
-import { TradeAssetSelect } from '@/components/AssetSelection/AssetSelection'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { TradeAssetInput } from '@/components/MultiHopTrade/components/TradeAssetInput'
-import { Row } from '@/components/Row/Row'
-import { SlideTransition } from '@/components/SlideTransition'
-import { RawText } from '@/components/Text'
-import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
-import { useIsSmartContractAddress } from '@/hooks/useIsSmartContractAddress/useIsSmartContractAddress'
-import { useModal } from '@/hooks/useModal/useModal'
-import { useToggle } from '@/hooks/useToggle/useToggle'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { getMaybeCompositeAssetSymbol } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { getThorchainFromAddress } from '@/lib/utils/thorchain'
-import { getThorchainLendingPosition } from '@/lib/utils/thorchain/lending'
-import type { LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { isUtxoChainId } from '@/lib/utils/utxo'
-import { useGetEstimatedFeesQuery } from '@/pages/Lending/hooks/useGetEstimatedFeesQuery'
-import { useIsSweepNeededQuery } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
-import { useLendingQuoteOpenQuery } from '@/pages/Lending/hooks/useLendingQuoteQuery'
-import { useLendingSupportedAssets } from '@/pages/Lending/hooks/useLendingSupportedAssets'
-import { usePoolDataQuery } from '@/pages/Lending/hooks/usePoolDataQuery'
-import { useQuoteEstimatedFeesQuery } from '@/react-queries/hooks/useQuoteEstimatedFeesQuery'
-import {
-  selectAssetById,
-  selectAssets,
-  selectFeeAssetById,
-  selectPortfolioAccountMetadataByAccountId,
-  selectPortfolioCryptoBalanceByFilter,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-const UNSAFE_SLIPPAGE_DECIMAL_PERCENT = 0.05 // 5%
-
-const formControlProps = {
-  borderRadius: 0,
-  background: 'transparent',
-  borderWidth: 0,
-  paddingBottom: 0,
-}
-
-type BorrowInputProps = {
-  isAccountSelectionDisabled?: boolean
-  collateralAssetId: AssetId
-  depositAmountCryptoPrecision: string | null
-  fiatDepositAmount: string | null
-  onDepositAmountChange: (value: string, isFiat?: boolean) => void
-  collateralAccountId: AccountId
-  borrowAccountId: AccountId
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onBorrowAccountIdChange: (accountId: AccountId) => void
-  borrowAsset: Asset | null
-  setBorrowAsset: (asset: Asset) => void
-  confirmedQuote: LendingQuoteOpen | null
-  setConfirmedQuote: (quote: LendingQuoteOpen | null) => void
-}
-
-const percentOptions = [0]
-
-export const BorrowInput = ({
-  isAccountSelectionDisabled,
-  collateralAssetId,
-  depositAmountCryptoPrecision,
-  fiatDepositAmount,
-  onDepositAmountChange,
-  collateralAccountId,
-  borrowAccountId,
-  onCollateralAccountIdChange: handleCollateralAccountIdChange,
-  onBorrowAccountIdChange: handleBorrowAccountIdChange,
-  borrowAsset,
-  setBorrowAsset,
-  confirmedQuote,
-  setConfirmedQuote,
-}: BorrowInputProps) => {
-  const [borrowAssetIsFiat, toggleBorrowAssetIsFiat] = useToggle(false)
-  const [collateralAssetIsFiat, toggleCollateralAssetIsFiat] = useToggle(false)
-  const [shouldShowWarningAcknowledgement, setShouldShowWarningAcknowledgement] = useState(false)
-
-  const {
-    state: { wallet },
-  } = useWallet()
-  const translate = useTranslate()
-  const navigate = useNavigate()
-
-  const { data: borrowAssets, isLoading: isSupportedBorrowAssetsLoading } =
-    useLendingSupportedAssets({ type: 'borrow' })
-  const borrowAssetIds = useMemo(() => {
-    return borrowAssets?.map(borrowAsset => borrowAsset.assetId) ?? []
-  }, [borrowAssets])
-  const { data: collateralAssets, isLoading: isSupportedCollateralAssetsLoading } =
-    useLendingSupportedAssets({ type: 'borrow' })
-  const collateralAssetIds = useMemo(() => {
-    return collateralAssets?.map(collateralAsset => collateralAsset.assetId) ?? []
-  }, [collateralAssets])
-
-  const usePoolDataArgs = useMemo(() => ({ poolAssetId: collateralAssetId }), [collateralAssetId])
-  const { data: poolData, isLoading: isPoolDataLoading } = usePoolDataQuery(usePoolDataArgs)
-  const isHardCapReached = useMemo(() => {
-    if (!poolData) return null
-    return bnOrZero(poolData.tvl).eq(poolData.maxSupplyFiat)
-  }, [poolData])
-
-  const isThorchainLendingBorrowEnabled = useFeatureFlag('ThorchainLendingBorrow')
-
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-
-  useEffect(() => {
-    if (!(collateralAsset && borrowAssets)) return
-    if (borrowAsset) return
-
-    if (!borrowAsset) setBorrowAsset(collateralAsset)
-  }, [borrowAsset, borrowAssets, collateralAsset, setBorrowAsset])
-
-  const swapIcon = useMemo(() => <ArrowDownIcon />, [])
-
-  const buyAssetSearch = useModal('buyAssetSearch')
-
-  const handleBorrowAssetClick = useCallback(() => {
-    buyAssetSearch.open({
-      onAssetClick: setBorrowAsset,
-      title: 'lending.borrow',
-      assets: borrowAssets ?? [],
-    })
-  }, [borrowAssets, buyAssetSearch, setBorrowAsset])
-
-  const handleDepositInputChange = useCallback(
-    (value: string, isFiat?: boolean) => {
-      onDepositAmountChange(value, isFiat)
-    },
-    [onDepositAmountChange],
-  )
-
-  const collateralAccountFilter = useMemo(
-    () => ({ accountId: collateralAccountId }),
-    [collateralAccountId],
-  )
-  const collateralAccountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, collateralAccountFilter),
-  )
-
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', collateralAccountId, collateralAssetId],
-    queryFn:
-      collateralAccountId && wallet && collateralAccountMetadata && collateralAssetId
-        ? () =>
-            getThorchainFromAddress({
-              accountId: collateralAccountId,
-              assetId: collateralAssetId,
-              getPosition: getThorchainLendingPosition,
-              accountMetadata: collateralAccountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
-  const {
-    data: estimatedFeesData,
-    isLoading: isEstimatedFeesDataLoading,
-    isError: isEstimatedFeesDataError,
-    isSuccess: isEstimatedFeesDataSuccess,
-  } = useQuoteEstimatedFeesQuery({
-    collateralAssetId,
-    collateralAccountId,
-    depositAmountCryptoPrecision: depositAmountCryptoPrecision ?? '0',
-    confirmedQuote,
-  })
-
-  const balanceFilter = useMemo(
-    () => ({ assetId: collateralAssetId, accountId: collateralAccountId }),
-    [collateralAssetId, collateralAccountId],
-  )
-  const balanceCryptoBaseUnit = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, balanceFilter),
-  ).toBaseUnit()
-  const collateralFeeAsset = useAppSelector(state => selectFeeAssetById(state, collateralAssetId))
-  const borrowFeeAsset = useAppSelector(state =>
-    selectFeeAssetById(state, borrowAsset?.assetId ?? ''),
-  )
-
-  const collateralFeeAssetBalanceFilter = useMemo(
-    () => ({ assetId: collateralFeeAsset?.assetId ?? '', accountId: collateralAccountId }),
-    [collateralAccountId, collateralFeeAsset?.assetId],
-  )
-  const collateralFeeAssetBalanceCryptoBaseUnit = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, collateralFeeAssetBalanceFilter),
-  ).toBaseUnit()
-
-  const amountAvailableCryptoPrecision = useMemo(
-    () =>
-      BigAmount.fromBaseUnit({
-        value: balanceCryptoBaseUnit,
-        precision: collateralAsset?.precision ?? 0,
-      }).toPrecision(),
-    [balanceCryptoBaseUnit, collateralAsset?.precision],
-  )
-
-  const hasEnoughBalanceForTx = useMemo(
-    () => bnOrZero(depositAmountCryptoPrecision).lte(amountAvailableCryptoPrecision),
-    [amountAvailableCryptoPrecision, depositAmountCryptoPrecision],
-  )
-
-  const hasEnoughBalanceForTxPlusFees = useMemo(() => {
-    if (!(isEstimatedFeesDataSuccess && collateralFeeAsset)) return false
-
-    // This is a native asset, so we can deduct the fees from the value
-    if (collateralFeeAsset.assetId === collateralAssetId)
-      return bnOrZero(depositAmountCryptoPrecision)
-        .plus(
-          BigAmount.fromBaseUnit({
-            value: estimatedFeesData.txFeeCryptoBaseUnit,
-            precision: collateralFeeAsset?.precision ?? 0,
-          }).toPrecision(),
-        )
-        .lte(amountAvailableCryptoPrecision)
-
-    return (
-      bnOrZero(depositAmountCryptoPrecision).lte(amountAvailableCryptoPrecision) &&
-      bnOrZero(estimatedFeesData.txFeeCryptoBaseUnit).lte(collateralFeeAssetBalanceCryptoBaseUnit)
-    )
-  }, [
-    amountAvailableCryptoPrecision,
-    collateralAssetId,
-    depositAmountCryptoPrecision,
-    estimatedFeesData?.txFeeCryptoBaseUnit,
-    collateralFeeAsset,
-    collateralFeeAssetBalanceCryptoBaseUnit,
-    isEstimatedFeesDataSuccess,
-  ])
-
-  const isSweepNeededArgs = useMemo(
-    () => ({
-      assetId: collateralAssetId,
-      address: fromAddress,
-      amountCryptoBaseUnit: BigAmount.fromPrecision({
-        value: depositAmountCryptoPrecision ?? 0,
-        precision: collateralAsset?.precision ?? 0, // actually always defined at runtime, see "enabled" option
-      }).toBaseUnit(),
-      txFeeCryptoBaseUnit: estimatedFeesData?.txFeeCryptoBaseUnit,
-      // Don't fetch sweep needed if there isn't enough balance for the tx + fees, since adding in a sweep Tx would obviously fail too
-      enabled: Boolean(
-        bnOrZero(depositAmountCryptoPrecision).gt(0) && hasEnoughBalanceForTxPlusFees,
-      ),
-    }),
-    [
-      collateralAsset?.precision,
-      collateralAssetId,
-      depositAmountCryptoPrecision,
-      estimatedFeesData?.txFeeCryptoBaseUnit,
-      fromAddress,
-      hasEnoughBalanceForTxPlusFees,
-    ],
-  )
-  const {
-    data: isSweepNeeded,
-    isLoading: isSweepNeededLoading,
-    isSuccess: isSweepNeededSuccess,
-  } = useIsSweepNeededQuery(isSweepNeededArgs)
-
-  const {
-    data: estimatedSweepFeesData,
-    isLoading: isEstimatedSweepFeesDataLoading,
-    isSuccess: isEstimatedSweepFeesDataSuccess,
-  } = useGetEstimatedFeesQuery({
-    amountCryptoPrecision: '0',
-    assetId: collateralAssetId,
-    feeAssetId: collateralFeeAsset?.assetId ?? '',
-    to: fromAddress ?? '',
-    sendMax: true,
-    accountId: collateralAccountId,
-    contractAddress: undefined,
-    enabled: Boolean(collateralFeeAsset && isSweepNeededSuccess),
-  })
-
-  const hasEnoughBalanceForTxPlusSweep = useMemo(() => {
-    if (!(isEstimatedFeesDataSuccess && isEstimatedSweepFeesDataSuccess && estimatedSweepFeesData))
-      return false
-
-    return bnOrZero(depositAmountCryptoPrecision)
-      .plus(
-        BigAmount.fromBaseUnit({
-          value: estimatedFeesData.txFeeCryptoBaseUnit,
-          precision: collateralFeeAsset?.precision ?? 0,
-        }).toPrecision(),
-      )
-      .plus(
-        BigAmount.fromBaseUnit({
-          value: estimatedSweepFeesData.txFeeCryptoBaseUnit,
-          precision: collateralFeeAsset?.precision ?? 0,
-        }).toPrecision(),
-      )
-      .lte(amountAvailableCryptoPrecision)
-  }, [
-    amountAvailableCryptoPrecision,
-    collateralFeeAsset,
-    depositAmountCryptoPrecision,
-    estimatedFeesData?.txFeeCryptoBaseUnit,
-    estimatedSweepFeesData,
-    isEstimatedFeesDataSuccess,
-    isEstimatedSweepFeesDataSuccess,
-  ])
-
-  const useLendingQuoteQueryArgs = useMemo(
-    () => ({
-      collateralAssetId,
-      collateralAccountId,
-      borrowAccountId,
-      borrowAssetId: borrowAsset?.assetId ?? '',
-      depositAmountCryptoPrecision: depositAmountCryptoPrecision ?? '0',
-    }),
-    [
-      borrowAccountId,
-      borrowAsset?.assetId,
-      collateralAccountId,
-      collateralAssetId,
-      depositAmountCryptoPrecision,
-    ],
-  )
-  const {
-    data,
-    isLoading: isLendingQuoteLoading,
-    isRefetching: isLendingQuoteRefetching,
-    isSuccess: isLendingQuoteSuccess,
-    isError: isLendingQuoteError,
-    error: lendingQuoteError,
-  } = useLendingQuoteOpenQuery(useLendingQuoteQueryArgs)
-
-  const lendingQuoteData = isLendingQuoteError ? null : data
-
-  const quoteSlippageDecimalPercentage = useMemo(() => {
-    return lendingQuoteData
-      ? bnOrZero(lendingQuoteData.quoteSlippageBorrowedAssetUsd)
-          .div(lendingQuoteData.quoteCollateralAmountFiatUsd)
-          .toNumber()
-      : undefined
-  }, [lendingQuoteData])
-
-  const isUnsafeQuote = useMemo(
-    () =>
-      quoteSlippageDecimalPercentage &&
-      quoteSlippageDecimalPercentage > UNSAFE_SLIPPAGE_DECIMAL_PERCENT,
-    [quoteSlippageDecimalPercentage],
-  )
-
-  useEffect(() => {
-    setConfirmedQuote(lendingQuoteData ?? null)
-  }, [isLendingQuoteSuccess, lendingQuoteData, setConfirmedQuote])
-
-  const userAddress = useMemo(() => {
-    if (!collateralAccountId) return ''
-
-    return fromAccountId(collateralAccountId).account
-  }, [collateralAccountId])
-
-  const { data: _isSmartContractAddress, isLoading: isAddressByteCodeLoading } =
-    useIsSmartContractAddress(userAddress, borrowAsset?.chainId ?? '')
-
-  const disableSmartContractDeposit = useMemo(() => {
-    // This is either a smart contract address, or the bytecode is still loading - disable confirm
-    if (_isSmartContractAddress) return true
-
-    // All checks passed - this is an EOA address
-    return false
-  }, [_isSmartContractAddress])
-
-  const mixpanel = getMixPanel()
-  const onSubmit = useCallback(() => {
-    if (!lendingQuoteData || !collateralAsset || !borrowAsset) return
-
-    if (mixpanel) {
-      const assets = selectAssets(store.getState())
-
-      const compositeBorrowAsset = getMaybeCompositeAssetSymbol(borrowAsset.assetId, assets)
-      const compositeCollateralAsset = getMaybeCompositeAssetSymbol(collateralAsset.assetId, assets)
-
-      const eventData = {
-        borrowAsset: compositeBorrowAsset,
-        collateralAsset: compositeCollateralAsset,
-        borrowAssetChain: borrowFeeAsset?.networkName,
-        collateralAssetChain: collateralFeeAsset?.networkName,
-        totalFeesUserCurrency: bn(lendingQuoteData.quoteTotalFeesFiatUserCurrency).toFixed(2),
-        totalFeesUsd: bn(lendingQuoteData.quoteTotalFeesFiatUsd).toFixed(2),
-        depositAmountCryptoPrecision,
-        collateralAmountCryptoPrecision: lendingQuoteData.quoteCollateralAmountCryptoPrecision,
-        collateralAmountUserCurrency: bn(
-          lendingQuoteData.quoteCollateralAmountFiatUserCurrency,
-        ).toFixed(2),
-        collateralAmountUsd: bn(lendingQuoteData.quoteCollateralAmountFiatUsd).toFixed(2),
-        borrowedAmountUserCurrency: bn(lendingQuoteData.quoteBorrowedAmountUserCurrency).toFixed(2),
-        borrowedAmountUsd: bn(lendingQuoteData.quoteBorrowedAmountUsd).toFixed(2),
-        borrowedAmountCryptoPrecision: lendingQuoteData.quoteBorrowedAmountCryptoPrecision,
-        debtAmountUserCurrency: bn(lendingQuoteData.quoteDebtAmountUserCurrency).toFixed(2),
-        debtAmountUsd: bn(lendingQuoteData.quoteDebtAmountUsd).toFixed(2),
-      }
-      mixpanel.track(MixPanelEvent.BorrowPreview, eventData)
-    }
-
-    if (!isSweepNeeded) return navigate(BorrowRoutePaths.Confirm)
-    navigate(BorrowRoutePaths.Sweep)
-  }, [
-    borrowAsset,
-    borrowFeeAsset?.networkName,
-    collateralAsset,
-    collateralFeeAsset?.networkName,
-    depositAmountCryptoPrecision,
-    navigate,
-    isSweepNeeded,
-    lendingQuoteData,
-    mixpanel,
-  ])
-
-  const collateralAssetSelectComponent = useMemo(() => {
-    return (
-      <TradeAssetSelect
-        assetId={collateralAssetId}
-        assetIds={collateralAssetIds}
-        isReadOnly
-        isLoading={isSupportedCollateralAssetsLoading}
-        onlyConnectedChains={true}
-      />
-    )
-  }, [collateralAssetId, collateralAssetIds, isSupportedCollateralAssetsLoading])
-
-  const borrowAssetSelectComponent = useMemo(() => {
-    return (
-      <TradeAssetSelect
-        assetId={borrowAsset?.assetId ?? ''}
-        assetIds={borrowAssetIds}
-        onAssetClick={handleBorrowAssetClick}
-        onAssetChange={setBorrowAsset}
-        isLoading={isSupportedBorrowAssetsLoading}
-        onlyConnectedChains={true}
-      />
-    )
-  }, [
-    borrowAsset?.assetId,
-    borrowAssetIds,
-    setBorrowAsset,
-    handleBorrowAssetClick,
-    isSupportedBorrowAssetsLoading,
-  ])
-
-  const quoteErrorTranslation = useMemo(() => {
-    if (!isThorchainLendingBorrowEnabled) return 'lending.errors.borrowingDisabled'
-    if (isHardCapReached) return 'lending.errors.borrowingHalted'
-    if (_isSmartContractAddress) return 'trade.errors.smartContractWalletNotSupported'
-    if (
-      !hasEnoughBalanceForTx ||
-      (isLendingQuoteSuccess &&
-        isEstimatedFeesDataSuccess &&
-        collateralAsset &&
-        ((isUtxoChainId(collateralAsset.chainId) && !hasEnoughBalanceForTxPlusSweep) ||
-          !hasEnoughBalanceForTxPlusFees))
-    )
-      return 'common.insufficientFunds'
-    if (isLendingQuoteError) {
-      if (
-        /not enough fee/.test(lendingQuoteError.message) ||
-        /not enough to pay transaction fee/.test(lendingQuoteError.message)
-      )
-        return 'trade.errors.amountTooSmallUnknownMinimum'
-      if (/trading is halted/.test(lendingQuoteError.message))
-        return 'trade.errors.tradingNotActiveNoAssetSymbol'
-    }
-    return null
-  }, [
-    _isSmartContractAddress,
-    collateralAsset,
-    hasEnoughBalanceForTx,
-    hasEnoughBalanceForTxPlusFees,
-    hasEnoughBalanceForTxPlusSweep,
-    isEstimatedFeesDataSuccess,
-    isHardCapReached,
-    isLendingQuoteError,
-    isLendingQuoteSuccess,
-    isThorchainLendingBorrowEnabled,
-    lendingQuoteError?.message,
-  ])
-
-  const handleBorrowSubmit = useCallback(
-    () => (isUnsafeQuote ? setShouldShowWarningAcknowledgement(true) : onSubmit()),
-    [isUnsafeQuote, onSubmit],
-  )
-
-  if (!(collateralAsset && borrowAsset && collateralFeeAsset)) return null
-
-  return (
-    <SlideTransition>
-      <WarningAcknowledgement
-        message={translate('warningAcknowledgement.highSlippageBorrow', {
-          slippagePercentage: bnOrZero(quoteSlippageDecimalPercentage)
-            .times(100)
-            .toFixed(2)
-            .toString(),
-        })}
-        onAcknowledge={onSubmit}
-        shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
-        setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-      />
-      <Stack spacing={0} data-testid='lending-borrow-input'>
-        <TradeAssetInput
-          accountId={collateralAccountId}
-          assetId={collateralAssetId}
-          assetSymbol={collateralAsset.symbol}
-          assetIcon={collateralAsset.icon}
-          onChange={handleDepositInputChange}
-          onToggleIsFiat={toggleCollateralAssetIsFiat}
-          isFiat={collateralAssetIsFiat}
-          cryptoAmount={depositAmountCryptoPrecision ?? '0'}
-          fiatAmount={fiatDepositAmount ?? '0'}
-          isAccountSelectionDisabled={isAccountSelectionDisabled}
-          isSendMaxDisabled={false}
-          percentOptions={percentOptions}
-          showInputSkeleton={false}
-          showFiatSkeleton={false}
-          label={translate('lending.depositAsset', { asset: collateralAsset.symbol })}
-          onAccountIdChange={handleCollateralAccountIdChange}
-          formControlProps={formControlProps}
-          layout='inline'
-          labelPostFix={collateralAssetSelectComponent}
-        />
-        <Flex alignItems='center' justifyContent='center' my={-2}>
-          <Divider />
-          <IconButton
-            isRound
-            size='sm'
-            position='relative'
-            variant='outline'
-            borderColor='border.base'
-            zIndex={1}
-            aria-label={translate('lending.switchAssets')}
-            icon={swapIcon}
-          />
-          <Divider />
-        </Flex>
-        <TradeAssetInput
-          assetId={borrowAsset?.assetId ?? ''}
-          assetSymbol={borrowAsset.symbol}
-          assetIcon={borrowAsset.icon}
-          cryptoAmount={lendingQuoteData?.quoteBorrowedAmountCryptoPrecision ?? '0'}
-          fiatAmount={lendingQuoteData?.quoteBorrowedAmountUserCurrency ?? '0'}
-          isReadOnly
-          onToggleIsFiat={toggleBorrowAssetIsFiat}
-          isFiat={borrowAssetIsFiat}
-          isSendMaxDisabled={false}
-          percentOptions={percentOptions}
-          showInputSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
-          showFiatSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
-          label={translate('lending.borrow')}
-          onAccountIdChange={handleBorrowAccountIdChange}
-          formControlProps={formControlProps}
-          layout='inline'
-          labelPostFix={borrowAssetSelectComponent}
-        />
-        <Collapse in={isLendingQuoteSuccess}>
-          <LoanSummary
-            confirmedQuote={confirmedQuote}
-            isLoading={isLendingQuoteLoading || isLendingQuoteRefetching}
-            collateralAssetId={collateralAssetId}
-            collateralAccountId={collateralAccountId}
-            debtOccuredAmountUserCurrency={lendingQuoteData?.quoteDebtAmountUserCurrency ?? '0'}
-            depositAmountCryptoPrecision={depositAmountCryptoPrecision ?? '0'}
-            borrowAssetId={borrowAsset?.assetId ?? ''}
-            borrowAccountId={borrowAccountId}
-          />
-          <CardFooter
-            borderTopWidth={1}
-            borderColor='border.subtle'
-            flexDir='column'
-            gap={4}
-            px={6}
-            py={4}
-            bg='background.surface.raised.accent'
-          >
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('common.slippage')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <Amount.Crypto
-                    value={lendingQuoteData?.quoteSlippageBorrowedAssetCryptoPrecision ?? '0'}
-                    symbol={borrowAsset.symbol}
-                  />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('common.gasFee')}</Row.Label>
-              <Row.Value>
-                <Skeleton
-                  isLoaded={
-                    isEstimatedFeesDataSuccess && isLendingQuoteSuccess && !isLendingQuoteRefetching
-                  }
-                >
-                  <Amount.Fiat value={estimatedFeesData?.txFeeFiat ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            {isSweepNeeded && (
-              <Row fontSize='sm' fontWeight='medium'>
-                <HelperTooltip label={translate('modals.send.consolidate.tooltip')}>
-                  <Row.Label>{translate('modals.send.consolidate.consolidateFunds')}</Row.Label>
-                </HelperTooltip>
-                <Row.Value>
-                  <Skeleton
-                    isLoaded={Boolean(isEstimatedSweepFeesDataSuccess && estimatedSweepFeesData)}
-                  >
-                    <Amount.Fiat value={estimatedSweepFeesData?.txFeeFiat ?? '0'} />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-            )}
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('common.fees')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <Amount.Fiat value={lendingQuoteData?.quoteTotalFeesFiatUserCurrency ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                  <RawText fontWeight='bold'>
-                    {prettyMilliseconds(lendingQuoteData?.quoteTotalTimeMs ?? 0)}
-                  </RawText>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-          </CardFooter>
-        </Collapse>
-        <CardFooter
-          borderTopWidth={1}
-          borderColor='border.subtle'
-          flexDir='column'
-          gap={4}
-          px={6}
-          py={4}
-          bg='background.surface.raised.accent'
-          borderBottomRadius='xl'
-        >
-          <Button
-            size='lg-multiline'
-            colorScheme={isLendingQuoteError || quoteErrorTranslation ? 'red' : 'blue'}
-            mx={-2}
-            onClick={handleBorrowSubmit}
-            isLoading={
-              isPoolDataLoading ||
-              isLendingQuoteLoading ||
-              isLendingQuoteRefetching ||
-              isEstimatedFeesDataLoading ||
-              isEstimatedSweepFeesDataLoading ||
-              isEstimatedSweepFeesDataLoading ||
-              isAddressByteCodeLoading ||
-              isSweepNeededLoading
-            }
-            isDisabled={Boolean(
-              isHardCapReached ||
-                !isThorchainLendingBorrowEnabled ||
-                bnOrZero(depositAmountCryptoPrecision).isZero() ||
-                isLendingQuoteError ||
-                isLendingQuoteLoading ||
-                isLendingQuoteRefetching ||
-                quoteErrorTranslation ||
-                isEstimatedFeesDataError ||
-                isEstimatedFeesDataLoading ||
-                disableSmartContractDeposit,
-            )}
-          >
-            {quoteErrorTranslation ? translate(quoteErrorTranslation) : translate('lending.borrow')}
-          </Button>
-        </CardFooter>
-      </Stack>
-    </SlideTransition>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Borrow/BorrowSweep.tsx b/src/pages/Lending/Pool/components/Borrow/BorrowSweep.tsx
deleted file mode 100644
index ba63c6ffe90..00000000000
--- a/src/pages/Lending/Pool/components/Borrow/BorrowSweep.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { CardHeader, Flex, Heading } from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import { useCallback, useMemo } from 'react'
-import { useNavigate } from 'react-router-dom'
-
-import { BorrowRoutePaths } from './types'
-
-import { WithBackButton } from '@/components/MultiHopTrade/components/WithBackButton'
-import { SlideTransition } from '@/components/SlideTransition'
-import { Sweep } from '@/components/Sweep'
-import { Text } from '@/components/Text'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { getThorchainFromAddress } from '@/lib/utils/thorchain'
-import { getThorchainLendingPosition } from '@/lib/utils/thorchain/lending'
-import { selectPortfolioAccountMetadataByAccountId } from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type BorrowSweepProps = {
-  collateralAssetId: AssetId
-  collateralAccountId: AccountId
-}
-
-export const BorrowSweep = ({ collateralAssetId, collateralAccountId }: BorrowSweepProps) => {
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const navigate = useNavigate()
-
-  const handleBack = useCallback(() => {
-    navigate(BorrowRoutePaths.Input)
-  }, [navigate])
-
-  const collateralAccountFilter = useMemo(
-    () => ({ accountId: collateralAccountId }),
-    [collateralAccountId],
-  )
-  const collateralAccountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, collateralAccountFilter),
-  )
-
-  const { data: fromAddress } = useQuery({
-    queryKey: ['thorchainFromAddress', collateralAccountId, collateralAssetId],
-    queryFn:
-      collateralAccountId && wallet && collateralAccountMetadata && collateralAssetId
-        ? () =>
-            getThorchainFromAddress({
-              accountId: collateralAccountId,
-              assetId: collateralAssetId,
-              getPosition: getThorchainLendingPosition,
-              accountMetadata: collateralAccountMetadata,
-              wallet,
-            })
-        : skipToken,
-  })
-
-  const handleSwepSeen = useCallback(() => {
-    navigate(BorrowRoutePaths.Confirm)
-  }, [navigate])
-
-  return (
-    <SlideTransition>
-      <Flex flexDir='column' width='full'>
-        <CardHeader>
-          <WithBackButton onBack={handleBack}>
-            <Heading as='h5' textAlign='center'>
-              <Text translation='Consolidate Funds' />
-            </Heading>
-          </WithBackButton>
-        </CardHeader>
-        <Sweep
-          accountId={collateralAccountId}
-          assetId={collateralAssetId}
-          fromAddress={fromAddress ?? null}
-          onBack={handleBack}
-          onSweepSeen={handleSwepSeen}
-        />
-      </Flex>
-    </SlideTransition>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Borrow/types.ts b/src/pages/Lending/Pool/components/Borrow/types.ts
deleted file mode 100644
index cc4ccd6bbe6..00000000000
--- a/src/pages/Lending/Pool/components/Borrow/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum BorrowRoutePaths {
-  Input = '/borrow/input',
-  Confirm = '/borrow/confirm',
-  Sweep = '/borrow/sweep',
-}
diff --git a/src/pages/Lending/Pool/components/Faq.tsx b/src/pages/Lending/Pool/components/Faq.tsx
deleted file mode 100644
index f4abb373bf8..00000000000
--- a/src/pages/Lending/Pool/components/Faq.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-  Accordion,
-  AccordionButton,
-  AccordionItem,
-  AccordionPanel,
-  Card,
-  CardBody,
-} from '@chakra-ui/react'
-import { useMemo } from 'react'
-
-import { Text } from '@/components/Text'
-
-export const Faq = () => {
-  const defaultIndex = useMemo(() => [0], [])
-  return (
-    <Card>
-      <CardBody px={8} py={8} display='flex' flexDir='column' gap={6}>
-        <Text fontWeight='bold' fontSize='xl' translation='lending.faq.title' />
-        <Accordion variant='default' defaultIndex={defaultIndex}>
-          <AccordionItem px={0}>
-            <AccordionButton px={0}>
-              <Text fontWeight='bold' translation='lending.faq.lending.title' />
-            </AccordionButton>
-            <AccordionPanel px={0}>
-              <Text color='text.subtle' translation='lending.faq.lending.body' />
-            </AccordionPanel>
-          </AccordionItem>
-          <AccordionItem px={0}>
-            <AccordionButton px={0}>
-              <Text fontWeight='bold' translation='lending.faq.borrowing.title' />
-            </AccordionButton>
-            <AccordionPanel px={0}>
-              <Text color='text.subtle' translation='lending.faq.borrowing.body' />
-            </AccordionPanel>
-          </AccordionItem>
-          <AccordionItem px={0}>
-            <AccordionButton px={0}>
-              <Text fontWeight='bold' translation='lending.faq.repayments.title' />
-            </AccordionButton>
-            <AccordionPanel px={0}>
-              <Text color='text.subtle' translation='lending.faq.repayments.body' />
-            </AccordionPanel>
-          </AccordionItem>
-        </Accordion>
-      </CardBody>
-    </Card>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/LoanSummary.tsx b/src/pages/Lending/Pool/components/LoanSummary.tsx
deleted file mode 100644
index 24d240e32c9..00000000000
--- a/src/pages/Lending/Pool/components/LoanSummary.tsx
+++ /dev/null
@@ -1,249 +0,0 @@
-import { ArrowForwardIcon } from '@chakra-ui/icons'
-import type { StackProps } from '@chakra-ui/react'
-import { Skeleton, Stack } from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { bnOrZero } from '@shapeshiftoss/chain-adapters'
-import type { Asset } from '@shapeshiftoss/types'
-import BigNumber from 'bignumber.js'
-import React, { useMemo } from 'react'
-import { useTranslate } from 'react-polyglot'
-
-import { Amount } from '@/components/Amount/Amount'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Row } from '@/components/Row/Row'
-import { RawText } from '@/components/Text'
-import type { LendingQuoteClose, LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { isLendingQuoteClose, isLendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import { useLendingPositionData } from '@/pages/Lending/hooks/useLendingPositionData'
-import { useRepaymentLockData } from '@/pages/Lending/hooks/useRepaymentLockData'
-import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
-import { useAppSelector } from '@/state/store'
-
-const FromToStack: React.FC<StackProps> = props => {
-  const dividerIcon = useMemo(() => <ArrowForwardIcon color='text.subtle' borderLeft={0} />, [])
-  return (
-    <Stack
-      alignItems='center'
-      direction='row'
-      fontWeight='medium'
-      spacing={1}
-      divider={dividerIcon}
-      {...props}
-    />
-  )
-}
-
-type LoanSummaryProps = {
-  isLoading?: boolean
-  collateralAssetId: AssetId
-  confirmedQuote: LendingQuoteOpen | LendingQuoteClose | null
-} & StackProps &
-  (
-    | {
-        borrowAssetId: AssetId
-        borrowAccountId: AccountId
-        collateralAccountId: AccountId | null
-        collateralDecreaseAmountCryptoPrecision?: never
-        debtRepaidAmountUserCurrency?: never
-        debtOccuredAmountUserCurrency: string
-        depositAmountCryptoPrecision: string
-        repayAmountCryptoPrecision?: never
-        repaymentAccountId?: never
-        repaymentAsset?: never
-        repaymentPercent?: never
-      }
-    | {
-        borrowAssetId?: never
-        borrowAccountId?: never
-        collateralAccountId: AccountId | null
-        collateralDecreaseAmountCryptoPrecision: string
-        debtRepaidAmountUserCurrency: string
-        debtOccuredAmountUserCurrency?: never
-        depositAmountCryptoPrecision?: never
-        repayAmountCryptoPrecision: string
-        repaymentAccountId: AccountId
-        repaymentAsset: Asset | null
-        repaymentPercent: number
-      }
-  )
-
-export const LoanSummary: React.FC<LoanSummaryProps> = ({
-  isLoading,
-  collateralAssetId,
-  borrowAssetId,
-  depositAmountCryptoPrecision,
-  repayAmountCryptoPrecision,
-  debtRepaidAmountUserCurrency,
-  debtOccuredAmountUserCurrency,
-  repaymentAsset,
-  repaymentPercent,
-  repaymentAccountId,
-  collateralAccountId,
-  borrowAccountId,
-  confirmedQuote,
-  collateralDecreaseAmountCryptoPrecision,
-  ...rest
-}) => {
-  const translate = useTranslate()
-
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-  const accountId = collateralAccountId ?? ''
-
-  const { data: lendingPositionData, isLoading: isLendingPositionDataLoading } =
-    useLendingPositionData({
-      accountId,
-      assetId: collateralAssetId,
-    })
-
-  const useRepaymentLockDataArgs = useMemo(
-    () => ({ assetId: collateralAssetId, accountId: collateralAccountId }),
-    [collateralAccountId, collateralAssetId],
-  )
-  const { data: positionRepaymentLock, isLoading: isPositionRepaymentLockLoading } =
-    useRepaymentLockData(useRepaymentLockDataArgs)
-  const isRepaymentLocked = bnOrZero(positionRepaymentLock).gt(0)
-
-  const useRepaymentLockNetworkDataArgs = useMemo(() => ({}), [])
-  const { data: networkRepaymentLock, isLoading: isNetworkRepaymentLockLoading } =
-    useRepaymentLockData(useRepaymentLockNetworkDataArgs)
-
-  if (!collateralAsset || !confirmedQuote) return null
-
-  return (
-    <Stack
-      fontSize='sm'
-      px={6}
-      py={4}
-      spacing={4}
-      fontWeight='medium'
-      borderTopWidth={1}
-      borderColor='border.subtle'
-      mt={2}
-      {...rest}
-    >
-      <RawText fontWeight='bold'>{translate('lending.loanInformation')}</RawText>
-      {(bnOrZero(
-        (confirmedQuote as LendingQuoteClose)?.quoteLoanCollateralDecreaseCryptoPrecision,
-      ).gt(0) ||
-        bnOrZero((confirmedQuote as LendingQuoteOpen)?.quoteCollateralAmountCryptoPrecision).gt(
-          0,
-        )) && (
-        <Row>
-          <HelperTooltip label={translate('lending.quote.collateral')}>
-            <Row.Label>{translate('lending.collateral')}</Row.Label>
-          </HelperTooltip>
-          <Row.Value>
-            <Skeleton
-              isLoaded={Boolean(
-                !isLoading &&
-                  !isLendingPositionDataLoading &&
-                  confirmedQuote &&
-                  lendingPositionData &&
-                  lendingPositionData?.collateralBalanceCryptoPrecision,
-              )}
-            >
-              <FromToStack>
-                <Amount.Crypto
-                  color='text.subtle'
-                  value={lendingPositionData?.collateralBalanceCryptoPrecision ?? '0'}
-                  symbol={collateralAsset.symbol}
-                />
-                <Amount.Crypto
-                  value={(isLendingQuoteClose(confirmedQuote)
-                    ? bnOrZero(lendingPositionData?.collateralBalanceCryptoPrecision).minus(
-                        confirmedQuote.quoteLoanCollateralDecreaseCryptoPrecision ?? '0',
-                      )
-                    : bnOrZero(lendingPositionData?.collateralBalanceCryptoPrecision).plus(
-                        confirmedQuote.quoteCollateralAmountCryptoPrecision ?? '0',
-                      )
-                  ).toString()}
-                  symbol={collateralAsset.symbol}
-                />
-              </FromToStack>
-            </Skeleton>
-          </Row.Value>
-        </Row>
-      )}
-      <Row>
-        <HelperTooltip label={translate('lending.quote.debt')}>
-          <Row.Label>{translate('lending.debt')}</Row.Label>
-        </HelperTooltip>
-        <Row.Value>
-          <Skeleton
-            isLoaded={Boolean(!isLoading && !isLendingPositionDataLoading && confirmedQuote)}
-          >
-            <FromToStack>
-              <Amount.Fiat
-                color='text.subtle'
-                value={lendingPositionData?.debtBalanceFiatUserCurrency ?? '0'}
-              />
-              <Amount.Fiat
-                value={(isLendingQuoteClose(confirmedQuote)
-                  ? BigNumber.max(
-                      bnOrZero(lendingPositionData?.debtBalanceFiatUserCurrency).minus(
-                        debtRepaidAmountUserCurrency ?? 0,
-                      ),
-                      0,
-                    )
-                  : bnOrZero(lendingPositionData?.debtBalanceFiatUserCurrency).plus(
-                      debtOccuredAmountUserCurrency ?? 0,
-                    )
-                ).toString()}
-              />
-            </FromToStack>
-          </Skeleton>
-        </Row.Value>
-      </Row>
-      {isLendingQuoteOpen(confirmedQuote) && (
-        // This doesn't make sense for repayments - repayment lock shouldn't change when repaying, and will be zero'd out when fully repaying
-        <Row>
-          <HelperTooltip label={translate('lending.quote.repaymentLock')}>
-            <Row.Label>{translate('lending.repaymentLock')}</Row.Label>
-          </HelperTooltip>
-          <Row.Value>
-            <Skeleton isLoaded={!(isPositionRepaymentLockLoading || isNetworkRepaymentLockLoading)}>
-              <FromToStack>
-                <RawText color={isRepaymentLocked ? 'text.subtle' : 'green.500'}>
-                  {isRepaymentLocked
-                    ? translate('lending.repaymentDays', { numDays: positionRepaymentLock })
-                    : translate('lending.unlocked')}
-                </RawText>
-                <RawText>{networkRepaymentLock} days</RawText>
-              </FromToStack>
-            </Skeleton>
-          </Row.Value>
-        </Row>
-      )}
-      {isLendingQuoteOpen(confirmedQuote) && (
-        // This doesn't make sense for repayments - the collateralization ratio won't change here
-        <Row>
-          <HelperTooltip label={translate('lending.quote.collateralizationRatio')}>
-            <Row.Label>{translate('lending.collateralizationRatio')}</Row.Label>
-          </HelperTooltip>
-          <Row.Value>
-            <Skeleton
-              isLoaded={Boolean(!isLoading && !isLendingPositionDataLoading && confirmedQuote)}
-            >
-              <Amount.Percent
-                value={confirmedQuote?.quoteCollateralizationRatioPercentDecimal ?? '0'}
-                color='text.success'
-              />
-            </Skeleton>
-          </Row.Value>
-        </Row>
-      )}
-      <Row>
-        <HelperTooltip label={translate('lending.poolDepthDescription')}>
-          <Row.Label>{translate('lending.poolDepth')}</Row.Label>
-        </HelperTooltip>
-        <Row.Value>
-          <Skeleton
-            isLoaded={Boolean(!isLoading && !isLendingPositionDataLoading && confirmedQuote)}
-          >
-            <RawText color='text.success'>{translate('lending.healthy')}</RawText>
-          </Skeleton>
-        </Row.Value>
-      </Row>
-    </Stack>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/PoolInfo.tsx b/src/pages/Lending/Pool/components/PoolInfo.tsx
deleted file mode 100644
index 0d8a485c50a..00000000000
--- a/src/pages/Lending/Pool/components/PoolInfo.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-import { CheckCircleIcon } from '@chakra-ui/icons'
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  AlertTitle,
-  Button,
-  Flex,
-  Link,
-  Progress,
-  Skeleton,
-  Tag,
-  TagLeftIcon,
-  useColorModeValue,
-} from '@chakra-ui/react'
-import type { AssetId } from '@shapeshiftoss/caip'
-import { useCallback, useMemo } from 'react'
-import { BiErrorCircle } from 'react-icons/bi'
-import { FaTwitter } from 'react-icons/fa'
-import { useTranslate } from 'react-polyglot'
-
-import { Amount } from '@/components/Amount/Amount'
-import { DynamicComponent } from '@/components/DynamicComponent'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { RawText, Text } from '@/components/Text'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { useIsLendingActive } from '@/pages/Lending/hooks/useIsLendingActive'
-import { usePoolDataQuery } from '@/pages/Lending/hooks/usePoolDataQuery'
-import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
-import { useAppSelector } from '@/state/store'
-
-const labelProps = { fontSize: 'sm ' }
-const responsiveFlex = { base: 'auto', lg: 1 }
-const mobileDisplay = {
-  base: 'none',
-  lg: 'flex',
-}
-const faTwitterIcon = <FaTwitter />
-
-type PoolInfoProps = {
-  poolAssetId: AssetId
-}
-
-export const PoolInfo = ({ poolAssetId }: PoolInfoProps) => {
-  const alertBg = useColorModeValue('gray.200', 'gray.900')
-  const translate = useTranslate()
-  const asset = useAppSelector(state => selectAssetById(state, poolAssetId))
-
-  const { isLendingActive, isMimirLoading } = useIsLendingActive()
-
-  const usePoolDataArgs = useMemo(() => ({ poolAssetId }), [poolAssetId])
-  const { data: poolData, isLoading: isPoolDataLoading } = usePoolDataQuery(usePoolDataArgs)
-
-  const totalCollateralComponent = useMemo(
-    () => (
-      <Amount.Crypto
-        fontSize='2xl'
-        value={poolData?.totalCollateralCryptoPrecision ?? '0'}
-        symbol={asset?.symbol ?? ''}
-        fontWeight='medium'
-      />
-    ),
-    [asset?.symbol, poolData?.totalCollateralCryptoPrecision],
-  )
-  const totalDebtBalance = useMemo(
-    () => (
-      <Amount.Fiat
-        fontSize='2xl'
-        value={poolData?.totalDebtUserCurrency ?? 0}
-        fontWeight='medium'
-      />
-    ),
-    [poolData?.totalDebtUserCurrency],
-  )
-  const estCollateralizationRatioComponent = useMemo(
-    () => (
-      <Amount.Percent
-        value={poolData?.collateralizationRatioPercentDecimal ?? '0'}
-        color='text.success'
-        fontSize='lg'
-      />
-    ),
-    [poolData?.collateralizationRatioPercentDecimal],
-  )
-  const totalBorrowersComponent = useMemo(
-    () => <RawText fontSize='lg'>{poolData?.totalBorrowers ?? '0'}</RawText>,
-    [poolData?.totalBorrowers],
-  )
-
-  const StatusTag = useCallback(() => {
-    if ((!isLendingActive && !isMimirLoading) || !poolData?.isAssetLendingEnabled) {
-      return (
-        <Tag colorScheme='red'>
-          <TagLeftIcon as={BiErrorCircle} />
-          {translate('common.halted')}
-        </Tag>
-      )
-    }
-
-    if (poolData?.isHardCapReached || poolData?.currentCapFillPercentage === 100) {
-      return (
-        <Tag colorScheme='yellow'>
-          <TagLeftIcon as={BiErrorCircle} />
-          {translate('common.full')}
-        </Tag>
-      )
-    }
-
-    if (poolData?.isTradingActive) {
-      return (
-        <Tag colorScheme='green'>
-          <TagLeftIcon as={CheckCircleIcon} />
-          {translate('common.active')}
-        </Tag>
-      )
-    }
-
-    return (
-      <Tag colorScheme='red'>
-        <TagLeftIcon as={BiErrorCircle} />
-        {translate('common.halted')}
-      </Tag>
-    )
-  }, [poolData, translate, isLendingActive, isMimirLoading])
-
-  const poolAlert = useMemo(() => {
-    if (!poolData) return null
-
-    if ((!isLendingActive && !isMimirLoading) || !poolData.isAssetLendingEnabled) {
-      return (
-        <Alert status='warning' variant='subtle'>
-          <AlertIcon />
-          <AlertDescription>{translate('lending.haltedAlert')}</AlertDescription>
-        </Alert>
-      )
-    }
-
-    if (poolData.isHardCapReached || bnOrZero(poolData.currentCapFillPercentage).eq(100)) {
-      return (
-        <Alert status='warning' flexDir='column' bg={alertBg} py={4}>
-          <AlertIcon />
-          <AlertTitle>{translate('defi.modals.saversVaults.haltedDepositTitle')}</AlertTitle>
-          <>
-            <AlertDescription>
-              {translate('defi.modals.saversVaults.haltedDescription')}
-            </AlertDescription>
-            <Button
-              as={Link}
-              href={`https://twitter.com/intent/tweet?text=Hey%20%40THORChain%20%23raisethecaps%20already%20so%20I%20can%20lend%20%23${asset?.symbol}%20on%20%40ShapeShift`}
-              isExternal
-              mt={4}
-              colorScheme='twitter'
-              rightIcon={faTwitterIcon}
-            >
-              @THORChain
-            </Button>
-          </>
-        </Alert>
-      )
-    }
-
-    return (
-      <Progress
-        value={poolData.currentCapFillPercentage}
-        size='sm'
-        borderRadius='md'
-        colorScheme={bnOrZero(poolData.currentCapFillPercentage).lt(100) ? 'green' : 'red'}
-      />
-    )
-  }, [translate, poolData, alertBg, asset?.symbol, isLendingActive, isMimirLoading])
-
-  const renderVaultCap = useMemo(() => {
-    if (!poolData || !asset) return null
-
-    return (
-      <Flex flexWrap='wrap' direction='column' gap={4}>
-        <Flex justifyContent='space-between' alignItems='center'>
-          <HelperTooltip label={translate('defi.modals.saversVaults.vaultCapTooltip')}>
-            <Text fontWeight='medium' translation='defi.modals.saversVaults.vaultCap' />
-          </HelperTooltip>
-          <Flex gap={1}>
-            <Amount.Fiat value={poolData?.tvl} />
-            <Amount.Fiat value={poolData?.maxSupplyFiat} prefix='/' color='text.subtle' />
-          </Flex>
-        </Flex>
-
-        {poolAlert}
-      </Flex>
-    )
-  }, [asset, poolData, translate, poolAlert])
-
-  if (!asset) return null
-
-  return (
-    <>
-      <Flex gap={4} alignItems='center'>
-        <Text translation='lending.poolInformation' fontWeight='medium' />
-
-        <Skeleton isLoaded={!isPoolDataLoading} display={mobileDisplay}>
-          <StatusTag />
-        </Skeleton>
-      </Flex>
-      <Flex flexWrap='wrap' gap={4}>
-        <DynamicComponent
-          isLoading={isPoolDataLoading}
-          label='lending.totalCollateral'
-          component={totalCollateralComponent}
-          flex={responsiveFlex}
-          labelProps={labelProps}
-        />
-        <DynamicComponent
-          isLoading={isPoolDataLoading}
-          label='lending.totalDebtBalance'
-          component={totalDebtBalance}
-          flex={responsiveFlex}
-          labelProps={labelProps}
-        />
-      </Flex>
-      <Flex flexWrap='wrap' gap={4}>
-        <DynamicComponent
-          isLoading={isPoolDataLoading}
-          label='lending.estCollateralizationRatio'
-          component={estCollateralizationRatioComponent}
-          flex={responsiveFlex}
-          labelProps={labelProps}
-        />
-        <DynamicComponent
-          isLoading={isPoolDataLoading}
-          label='lending.totalBorrowers'
-          component={totalBorrowersComponent}
-          flex={responsiveFlex}
-          labelProps={labelProps}
-        />
-      </Flex>
-      {renderVaultCap}
-    </>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Repay/Repay.tsx b/src/pages/Lending/Pool/components/Repay/Repay.tsx
deleted file mode 100644
index 86b25f35033..00000000000
--- a/src/pages/Lending/Pool/components/Repay/Repay.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import { AnimatePresence } from 'framer-motion'
-import { lazy, memo, Suspense, useMemo } from 'react'
-import { MemoryRouter, useLocation } from 'react-router-dom'
-import { Route, Switch } from 'wouter'
-
-import { RepayRoutePaths } from './types'
-
-import { useRouteAssetId } from '@/hooks/useRouteAssetId/useRouteAssetId'
-import type { LendingQuoteClose } from '@/lib/utils/thorchain/lending/types'
-
-const RepayEntries = [RepayRoutePaths.Input, RepayRoutePaths.Confirm]
-
-type RepayProps = {
-  isAccountSelectionDisabled?: boolean
-  collateralAccountId: AccountId | null
-  repaymentAccountId: AccountId | null
-  repaymentAsset: Asset | null
-  setRepaymentAsset: (asset: Asset | null) => void
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onRepaymentAccountIdChange: (accountId: AccountId) => void
-  repaymentPercent: number
-  setRepaymentPercent: (value: number) => void
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteClose | null
-  setConfirmedQuote: (quote: LendingQuoteClose | null) => void
-}
-
-export const Repay = ({
-  isAccountSelectionDisabled,
-  collateralAccountId,
-  repaymentAccountId: borrowAccountId,
-  repaymentAsset,
-  setRepaymentAsset,
-  onCollateralAccountIdChange: handleCollateralAccountIdChange,
-  onRepaymentAccountIdChange: handleRepaymentAccountIdChange,
-  repaymentPercent,
-  setRepaymentPercent,
-  txId,
-  setTxid,
-  confirmedQuote,
-  setConfirmedQuote,
-}: RepayProps) => {
-  const collateralAssetId = useRouteAssetId()
-
-  return (
-    <MemoryRouter initialEntries={RepayEntries} initialIndex={0}>
-      <RepayRoutes
-        isAccountSelectionDisabled={isAccountSelectionDisabled}
-        repaymentAsset={repaymentAsset}
-        setRepaymentAsset={setRepaymentAsset}
-        collateralAssetId={collateralAssetId}
-        repaymentPercent={repaymentPercent}
-        onRepaymentPercentChange={setRepaymentPercent}
-        collateralAccountId={collateralAccountId}
-        repaymentAccountId={borrowAccountId}
-        onCollateralAccountIdChange={handleCollateralAccountIdChange}
-        onRepaymentAccountIdChange={handleRepaymentAccountIdChange}
-        txId={txId}
-        setTxid={setTxid}
-        confirmedQuote={confirmedQuote}
-        setConfirmedQuote={setConfirmedQuote}
-      />
-    </MemoryRouter>
-  )
-}
-
-type RepayRoutesProps = {
-  isAccountSelectionDisabled?: boolean
-  collateralAssetId: AssetId
-  repaymentAsset: Asset | null
-  setRepaymentAsset: (asset: Asset | null) => void
-  repaymentPercent: number
-  onRepaymentPercentChange: (value: number) => void
-  collateralAccountId: AccountId | null
-  repaymentAccountId: AccountId | null
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onRepaymentAccountIdChange: (accountId: AccountId) => void
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteClose | null
-  setConfirmedQuote: (quote: LendingQuoteClose | null) => void
-}
-
-const RepayInput = lazy(() =>
-  import('./RepayInput').then(({ RepayInput }) => ({
-    default: RepayInput,
-  })),
-)
-const RepayConfirm = lazy(() =>
-  import('./RepayConfirm').then(({ RepayConfirm }) => ({
-    default: RepayConfirm,
-  })),
-)
-
-const suspenseFallback = <div>Loading...</div>
-
-const RepayRoutes = memo(
-  ({
-    isAccountSelectionDisabled,
-    collateralAssetId,
-    repaymentPercent,
-    repaymentAsset,
-    setRepaymentAsset,
-    onRepaymentPercentChange,
-    collateralAccountId,
-    repaymentAccountId,
-    onCollateralAccountIdChange: handleCollateralAccountIdChange,
-    onRepaymentAccountIdChange: handleRepaymentAccountIdChange,
-    txId,
-    setTxid,
-    confirmedQuote,
-    setConfirmedQuote,
-  }: RepayRoutesProps) => {
-    const location = useLocation()
-
-    const repayInput = useMemo(
-      () => (
-        <RepayInput
-          isAccountSelectionDisabled={isAccountSelectionDisabled}
-          collateralAssetId={collateralAssetId}
-          repaymentPercent={repaymentPercent}
-          collateralAccountId={collateralAccountId}
-          repaymentAccountId={repaymentAccountId}
-          onCollateralAccountIdChange={handleCollateralAccountIdChange}
-          onRepaymentAccountIdChange={handleRepaymentAccountIdChange}
-          onRepaymentPercentChange={onRepaymentPercentChange}
-          repaymentAsset={repaymentAsset}
-          setRepaymentAsset={setRepaymentAsset}
-          confirmedQuote={confirmedQuote}
-          setConfirmedQuote={setConfirmedQuote}
-        />
-      ),
-      [
-        isAccountSelectionDisabled,
-        collateralAssetId,
-        repaymentPercent,
-        collateralAccountId,
-        repaymentAccountId,
-        handleCollateralAccountIdChange,
-        handleRepaymentAccountIdChange,
-        onRepaymentPercentChange,
-        repaymentAsset,
-        setRepaymentAsset,
-        confirmedQuote,
-        setConfirmedQuote,
-      ],
-    )
-
-    const repayConfirm = useMemo(
-      () => (
-        <RepayConfirm
-          collateralAssetId={collateralAssetId}
-          setRepaymentPercent={onRepaymentPercentChange}
-          collateralAccountId={collateralAccountId}
-          repaymentAccountId={repaymentAccountId}
-          repaymentAsset={repaymentAsset}
-          txId={txId}
-          setTxid={setTxid}
-          confirmedQuote={confirmedQuote}
-          setConfirmedQuote={setConfirmedQuote}
-        />
-      ),
-      [
-        collateralAssetId,
-        onRepaymentPercentChange,
-        collateralAccountId,
-        repaymentAccountId,
-        repaymentAsset,
-        txId,
-        setTxid,
-        confirmedQuote,
-        setConfirmedQuote,
-      ],
-    )
-
-    return (
-      <AnimatePresence mode='wait' initial={false}>
-        <Suspense fallback={suspenseFallback}>
-          <Switch location={location.pathname}>
-            <Route key={RepayRoutePaths.Input} path={RepayRoutePaths.Input}>
-              {repayInput}
-            </Route>
-            <Route key={RepayRoutePaths.Confirm} path={RepayRoutePaths.Confirm}>
-              {repayConfirm}
-            </Route>
-          </Switch>
-        </Suspense>
-      </AnimatePresence>
-    )
-  },
-)
diff --git a/src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx b/src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx
deleted file mode 100644
index d7b2786bdb2..00000000000
--- a/src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx
+++ /dev/null
@@ -1,575 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Box,
-  Button,
-  CardFooter,
-  CardHeader,
-  Divider,
-  Flex,
-  Heading,
-  Progress,
-  Skeleton,
-  Stack,
-  useInterval,
-} from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAssetId } from '@shapeshiftoss/caip'
-import { isEvmChainId } from '@shapeshiftoss/chain-adapters'
-import { isLedger } from '@shapeshiftoss/hdwallet-ledger'
-import { assertAndProcessMemo, SwapperName } from '@shapeshiftoss/swapper'
-import type { Asset } from '@shapeshiftoss/types'
-import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { BigAmount, isToken } from '@shapeshiftoss/utils'
-import { useMutation, useMutationState, useQuery } from '@tanstack/react-query'
-import dayjs from 'dayjs'
-import prettyMilliseconds from 'pretty-ms'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import { LoanSummary } from '../LoanSummary'
-import { RepayRoutePaths } from './types'
-
-import { Amount } from '@/components/Amount/Amount'
-import { AssetToAsset } from '@/components/AssetToAsset/AssetToAsset'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { WithBackButton } from '@/components/MultiHopTrade/components/WithBackButton'
-import { Row } from '@/components/Row/Row'
-import { SlideTransition } from '@/components/SlideTransition'
-import { RawText, Text } from '@/components/Text'
-import { getChainAdapterManager } from '@/context/PluginProvider/chainAdapterSingleton'
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { getMaybeCompositeAssetSymbol } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { waitForThorchainUpdate } from '@/lib/utils/thorchain'
-import { THORCHAIN_AFFILIATE_NAME } from '@/lib/utils/thorchain/constants'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import type { LendingQuoteClose } from '@/lib/utils/thorchain/lending/types'
-import { useLendingQuoteCloseQuery } from '@/pages/Lending/hooks/useLendingCloseQuery'
-import { useLendingPositionData } from '@/pages/Lending/hooks/useLendingPositionData'
-import { reactQueries } from '@/react-queries'
-import { selectInboundAddressData } from '@/react-queries/selectors'
-import {
-  selectAccountNumberByAccountId,
-  selectAssetById,
-  selectAssets,
-  selectFeeAssetById,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type RepayConfirmProps = {
-  collateralAssetId: AssetId
-  repaymentAsset: Asset | null
-  setRepaymentPercent: (percent: number) => void
-  collateralAccountId: AccountId | null
-  repaymentAccountId: AccountId | null
-  txId: string | null
-  setTxid: (txId: string | null) => void
-  confirmedQuote: LendingQuoteClose | null
-  setConfirmedQuote: (quote: LendingQuoteClose | null) => void
-}
-
-export const RepayConfirm = ({
-  collateralAssetId,
-  repaymentAsset,
-  setRepaymentPercent,
-  collateralAccountId,
-  repaymentAccountId,
-  txId,
-  setTxid,
-  confirmedQuote,
-  setConfirmedQuote,
-}: RepayConfirmProps) => {
-  const {
-    state: { wallet },
-  } = useWallet()
-
-  const [isLoanPending, setIsLoanPending] = useState(false)
-  const [isQuoteExpired, setIsQuoteExpired] = useState(false)
-  const [elapsedTime, setElapsedTime] = useState(0)
-
-  const { refetch: refetchLendingPositionData } = useLendingPositionData({
-    assetId: collateralAssetId,
-    accountId: collateralAccountId,
-  })
-
-  const { mutateAsync } = useMutation({
-    mutationKey: [txId],
-    mutationFn: async ({
-      txId: _txId,
-      expectedCompletionTime,
-    }: {
-      txId: string
-      expectedCompletionTime?: number
-    }) => {
-      if (!confirmedQuote) throw new Error('Cannot fetch THOR Tx status withut a confirmed quote')
-
-      // Enforcing outbound checks when repaying 100% since that will trigger a collateral refund transfer
-      // which we *want* to wait for before considering the repay as complete
-      await waitForThorchainUpdate({
-        txId: _txId,
-        skipOutbound: bn(confirmedQuote.repaymentPercent).lt(100),
-        expectedCompletionTime,
-      }).promise
-      queryClient.invalidateQueries({ queryKey: ['thorchainLendingPosition'], exact: false })
-    },
-  })
-
-  const lendingMutationStatus = useMutationState({
-    filters: { mutationKey: [txId] },
-    select: mutation => mutation.state.status,
-  })
-
-  const lendingMutationSubmittedAt = useMutationState({
-    filters: { mutationKey: [txId] },
-    select: mutation => mutation.state.submittedAt,
-  })
-
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-  const repaymentFeeAsset = useAppSelector(state =>
-    selectFeeAssetById(state, repaymentAsset?.assetId ?? ''),
-  )
-  const collateralFeeAsset = useAppSelector(state => selectFeeAssetById(state, collateralAssetId))
-
-  const eventData = useMemo(() => {
-    if (!confirmedQuote) return {}
-
-    const assets = selectAssets(store.getState())
-
-    const compositeRepaymentAsset = getMaybeCompositeAssetSymbol(
-      repaymentAsset?.assetId ?? '',
-      assets,
-    )
-    const compositeCollateralAsset = getMaybeCompositeAssetSymbol(
-      collateralAsset?.assetId ?? '',
-      assets,
-    )
-
-    return {
-      repaymentAsset: compositeRepaymentAsset,
-      collateralAsset: compositeCollateralAsset,
-      repaymentAssetChain: repaymentFeeAsset?.networkName,
-      collateralAssetChain: collateralFeeAsset?.networkName,
-      totalFeesUserCurrency: bn(confirmedQuote.quoteTotalFeesFiatUserCurrency).toFixed(2),
-      totalFeesUsd: bn(confirmedQuote.quoteTotalFeesFiatUsd).toFixed(2),
-      repaymentPercent: confirmedQuote.repaymentPercent,
-      repaymentAmountUserCurrency: bnOrZero(confirmedQuote.repaymentAmountFiatUserCurrency).toFixed(
-        2,
-      ),
-      repaymentAmountUsd: bnOrZero(confirmedQuote.repaymentAmountFiatUsd).toFixed(2),
-      repaymentAmountCryptoPrecision: confirmedQuote.repaymentAmountCryptoPrecision,
-      debtRepaidAmountUserCurrency: bn(confirmedQuote.quoteDebtRepaidAmountUserCurrency).toFixed(2),
-      debtRepaidAmountUsd: bn(confirmedQuote.quoteDebtRepaidAmountUsd).toFixed(2),
-      collateralDecreaseCryptoPrecision: confirmedQuote.quoteLoanCollateralDecreaseCryptoPrecision,
-      collateralDecreaseUserCurrency: bn(
-        confirmedQuote.quoteLoanCollateralDecreaseFiatUserCurrency,
-      ).toFixed(2),
-      collateralDecreaseUsd: bn(confirmedQuote.quoteLoanCollateralDecreaseFiatUsd).toFixed(2),
-    }
-  }, [
-    collateralAsset?.assetId,
-    collateralFeeAsset?.networkName,
-    confirmedQuote,
-    repaymentAsset?.assetId,
-    repaymentFeeAsset?.networkName,
-  ])
-
-  const mixpanel = getMixPanel()
-
-  const loanTxStatus = useMemo(() => lendingMutationStatus?.[0], [lendingMutationStatus])
-
-  useEffect(() => {
-    // don't start polling until we have a tx
-    if (!(txId && confirmedQuote)) return
-    ;(async () => {
-      const expectedCompletionTime = dayjs()
-        .add(confirmedQuote.quoteTotalTimeMs, 'millisecond')
-        .unix()
-      await mutateAsync({ txId, expectedCompletionTime })
-      mixpanel?.track(MixPanelEvent.RepaySuccess, eventData)
-      setIsLoanPending(false)
-    })()
-  }, [confirmedQuote, eventData, mixpanel, mutateAsync, refetchLendingPositionData, txId])
-
-  const navigate = useNavigate()
-  const translate = useTranslate()
-
-  const handleBack = useCallback(() => {
-    navigate(-1)
-  }, [navigate])
-
-  const divider = useMemo(() => <Divider />, [])
-
-  const chainAdapter = getChainAdapterManager().get(
-    fromAssetId(repaymentAsset?.assetId ?? '').chainId,
-  )
-  const repaymentAccountNumberFilter = useMemo(
-    () => ({ accountId: repaymentAccountId ?? '' }),
-    [repaymentAccountId],
-  )
-  const repaymentAccountNumber = useAppSelector(state =>
-    selectAccountNumberByAccountId(state, repaymentAccountNumberFilter),
-  )
-
-  const useLendingQuoteCloseQueryArgs = useMemo(
-    () => ({
-      // Refetching at confirm step should only be done programmatically with refetch if a quote expires and a user clicks "Refetch Quote"
-      enabled: false,
-      collateralAssetId,
-      collateralAccountId,
-      repaymentAssetId: repaymentAsset?.assetId ?? '',
-      repaymentAccountId,
-      // Use the previously locked quote's repayment perecent to refetch a quote after expiry
-      // This is locked in the confirmed quote and should never be programmatic, or we risk being off-by-one and missing a bit of dust for 100% repayments
-      repaymentPercent: confirmedQuote?.repaymentPercent ?? 0,
-    }),
-    [
-      collateralAccountId,
-      collateralAssetId,
-      repaymentAccountId,
-      repaymentAsset?.assetId,
-      confirmedQuote?.repaymentPercent,
-    ],
-  )
-
-  const { refetch: refetchQuote, isRefetching: isLendingQuoteCloseQueryRefetching } =
-    useLendingQuoteCloseQuery(useLendingQuoteCloseQueryArgs)
-
-  const { data: inboundAddressData, isLoading: isInboundAddressLoading } = useQuery({
-    ...reactQueries.thornode.inboundAddresses(),
-    staleTime: 60_000,
-    select: data => selectInboundAddressData(data, repaymentAsset?.assetId, SwapperName.Thorchain),
-    enabled: !!repaymentAsset?.assetId,
-  })
-
-  const memo = useMemo(() => {
-    if (!confirmedQuote) return null
-
-    return assertAndProcessMemo(confirmedQuote.quoteMemo, THORCHAIN_AFFILIATE_NAME)
-  }, [confirmedQuote])
-
-  const {
-    executeTransaction,
-    estimatedFeesData,
-    isEstimatedFeesDataLoading,
-    isEstimatedFeesDataError,
-  } = useSendThorTx({
-    assetId: repaymentAsset?.assetId ?? '',
-    accountId: repaymentAccountId,
-    amountCryptoBaseUnit: BigAmount.fromPrecision({
-      value: confirmedQuote?.repaymentAmountCryptoPrecision ?? 0,
-      precision: repaymentAsset?.precision ?? 0,
-    }).toBaseUnit(),
-    memo,
-    // no explicit from address required for repayments
-    fromAddress: '',
-    action: 'repayLoan',
-    disableEstimateFeesRefetch: isLoanPending,
-  })
-
-  const handleConfirm = useCallback(async () => {
-    if (isQuoteExpired) {
-      const { data: refetchedQuote } = await refetchQuote()
-      setConfirmedQuote(refetchedQuote ?? null)
-      return
-    }
-
-    if (loanTxStatus === 'pending') return // no-op
-    if (loanTxStatus === 'success') {
-      // Reset values when going back to input step
-      setTxid(null)
-      setConfirmedQuote(null)
-      setRepaymentPercent(100)
-      return navigate(RepayRoutePaths.Input)
-    }
-
-    if (
-      !(
-        repaymentAsset &&
-        wallet &&
-        chainAdapter &&
-        confirmedQuote?.repaymentAmountCryptoPrecision &&
-        repaymentAccountNumber !== undefined &&
-        (!isToken(repaymentAsset.assetId) ||
-          (isToken(repaymentAsset.assetId) && inboundAddressData))
-      )
-    )
-      return
-
-    // This should never happen, but if it does, we don't want to rug our testing accounts and have to wait 30.5 more days before testing again
-    if (
-      bn(confirmedQuote.repaymentPercent).gte(100) &&
-      bn(confirmedQuote.quoteLoanCollateralDecreaseCryptoPrecision).isZero()
-    ) {
-      throw new Error('100% repayments should trigger a collateral refund transfer')
-    }
-
-    setIsLoanPending(true)
-
-    mixpanel?.track(MixPanelEvent.RepayConfirm, eventData)
-
-    const _txId = await executeTransaction().catch((err: unknown) => {
-      console.error('[lending repay] executeTransaction failed:', err)
-      return undefined
-    })
-
-    if (!_txId) {
-      setIsLoanPending(false)
-      throw new Error('failed to broadcast transaction')
-    }
-
-    setTxid(_txId)
-  }, [
-    chainAdapter,
-    confirmedQuote?.quoteLoanCollateralDecreaseCryptoPrecision,
-    confirmedQuote?.repaymentAmountCryptoPrecision,
-    confirmedQuote?.repaymentPercent,
-    eventData,
-    navigate,
-    inboundAddressData,
-    isQuoteExpired,
-    loanTxStatus,
-    mixpanel,
-    executeTransaction,
-    refetchQuote,
-    repaymentAccountNumber,
-    repaymentAsset,
-    setConfirmedQuote,
-    setRepaymentPercent,
-    setTxid,
-    wallet,
-  ])
-
-  const swapStatus = useMemo(() => {
-    if (loanTxStatus === 'success') return TxStatus.Confirmed
-    if (loanTxStatus === 'pending') return TxStatus.Pending
-    return TxStatus.Unknown
-  }, [loanTxStatus])
-
-  // Quote expiration interval
-  useInterval(() => {
-    // This should never happen but it may
-    if (!confirmedQuote) return
-
-    // Since we run this interval check every second, subtract a few seconds to avoid
-    // off-by-one on the last second as well as the main thread being overloaded and running slow
-    const quoteExpiryUnix = dayjs.unix(confirmedQuote.quoteExpiry).subtract(5, 'second').unix()
-
-    const isExpired = dayjs.unix(quoteExpiryUnix).isBefore(dayjs())
-    setIsQuoteExpired(isExpired)
-  }, 1000)
-
-  // Elapsed time interval
-  useInterval(() => {
-    if (!loanTxStatus || !txId || !confirmedQuote) return
-    if (!lendingMutationSubmittedAt[0]) return
-
-    const submittedAt = lendingMutationSubmittedAt[0]
-    const newElapsedTime = dayjs().diff(dayjs(submittedAt))
-
-    if (newElapsedTime >= confirmedQuote.quoteTotalTimeMs) {
-      setElapsedTime(confirmedQuote.quoteTotalTimeMs)
-    } else {
-      setElapsedTime(newElapsedTime)
-    }
-  }, 1000)
-
-  const confirmTranslation = useMemo(() => {
-    if (isQuoteExpired) return 'lending.refetchQuote'
-
-    return loanTxStatus === 'success' ? 'lending.repayAgain' : 'lending.confirmAndRepay'
-  }, [isQuoteExpired, loanTxStatus])
-
-  const maybeLedgerOpenAppWarning = useMemo(() => {
-    if (!wallet || !isLedger(wallet)) return null
-
-    const chain = (() => {
-      if (!chainAdapter) return ''
-      // All EVM chains are managed using the Ethereum app on Ledger
-      if (isEvmChainId(fromAssetId(repaymentAsset?.assetId ?? '').chainId)) return 'Ethereum'
-      return chainAdapter?.getDisplayName()
-    })()
-
-    return (
-      <Alert status='info'>
-        <AlertIcon />
-        <AlertDescription>
-          <Text
-            // eslint is drunk, this whole JSX expression is already memoized
-            translation={['walletProvider.ledger.signWarning', { chain }]}
-          />
-        </AlertDescription>
-      </Alert>
-    )
-  }, [chainAdapter, repaymentAsset, wallet])
-
-  if (!collateralAsset || !repaymentAsset) return null
-
-  return (
-    <SlideTransition>
-      <Flex flexDir='column' width='full' data-testid='lending-repay-confirm'>
-        <CardHeader>
-          <WithBackButton onBack={handleBack}>
-            <Heading as='h5' textAlign='center'>
-              <Text translation='Confirm' />
-            </Heading>
-          </WithBackButton>
-        </CardHeader>
-        <Stack spacing={0} divider={divider}>
-          <Stack spacing={0} pb={4}>
-            <AssetToAsset
-              buyIcon={collateralAsset?.icon ?? ''}
-              sellIcon={repaymentAsset?.icon ?? ''}
-              buyColor={collateralAsset?.color ?? ''}
-              sellColor={repaymentAsset?.color ?? ''}
-              status={swapStatus}
-              px={6}
-              mb={4}
-            />
-            <Flex px={6}>
-              <Progress
-                width='full'
-                borderRadius='full'
-                size='sm'
-                min={0}
-                max={confirmedQuote?.quoteTotalTimeMs ?? 0}
-                value={elapsedTime}
-                hasStripe
-                isAnimated={loanTxStatus === 'pending'}
-                colorScheme={loanTxStatus === 'success' ? 'green' : 'blue'}
-              />
-            </Flex>
-          </Stack>
-          <Stack py={4} spacing={4} px={6} fontSize='sm' fontWeight='medium'>
-            <RawText fontWeight='bold'>{translate('lending.transactionInfo')}</RawText>
-            <Row>
-              <Row.Label>{translate('common.send')}</Row.Label>
-              <Row.Value textAlign='right'>
-                <Skeleton isLoaded={Boolean(confirmedQuote)}>
-                  <Stack spacing={1} flexDir='row' flexWrap='wrap'>
-                    <Amount.Crypto
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.repaymentAmountCryptoPrecision ?? '0'}
-                      symbol={repaymentAsset?.symbol ?? ''}
-                    />
-                    <Amount.Fiat
-                      color='text.subtle'
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.quoteDebtRepaidAmountUserCurrency ?? '0'}
-                      prefix='≈'
-                    />
-                  </Stack>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row>
-              <HelperTooltip label={translate('lending.receiveCollateral')}>
-                <Row.Label>{translate('common.receive')}</Row.Label>
-              </HelperTooltip>
-              <Row.Value textAlign='right'>
-                <Skeleton isLoaded={Boolean(confirmedQuote)}>
-                  <Stack spacing={1} flexDir='row' flexWrap='wrap'>
-                    <Amount.Crypto
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.quoteLoanCollateralDecreaseCryptoPrecision ?? '0'}
-                      symbol={collateralAsset?.symbol ?? ''}
-                    />
-                    <Amount.Fiat
-                      color='text.subtle'
-                      // Actually defined at display time, see isLoaded above
-                      value={confirmedQuote?.quoteLoanCollateralDecreaseFiatUserCurrency ?? '0'}
-                      prefix='≈'
-                    />
-                  </Stack>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <HelperTooltip label={translate('lending.feesNotice')}>
-                <Row.Label>{translate('common.feesPlusSlippage')}</Row.Label>
-              </HelperTooltip>
-              <Row.Value>
-                <Skeleton isLoaded={Boolean(confirmedQuote)}>
-                  <Amount.Fiat
-                    // Actually defined at display time, see isLoaded above
-                    value={confirmedQuote?.quoteTotalFeesFiatUserCurrency ?? '0'}
-                  />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('common.gasFee')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={!isEstimatedFeesDataLoading}>
-                  {/* Actually defined at display time, see isLoaded above */}
-                  <Amount.Fiat value={estimatedFeesData?.txFeeFiat ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
-              <Row.Value>
-                <Skeleton isLoaded={Boolean(confirmedQuote)}>
-                  <RawText fontWeight='bold'>
-                    {prettyMilliseconds(confirmedQuote?.quoteTotalTimeMs ?? 0)}
-                  </RawText>
-                </Skeleton>
-              </Row.Value>
-            </Row>
-          </Stack>
-          <LoanSummary
-            confirmedQuote={confirmedQuote}
-            repaymentAsset={repaymentAsset}
-            collateralAssetId={collateralAssetId}
-            repaymentPercent={confirmedQuote?.repaymentPercent ?? 0}
-            repayAmountCryptoPrecision={confirmedQuote?.repaymentAmountCryptoPrecision ?? '0'}
-            collateralDecreaseAmountCryptoPrecision={
-              confirmedQuote?.quoteLoanCollateralDecreaseCryptoPrecision ?? '0'
-            }
-            repaymentAccountId={repaymentAccountId ?? ''}
-            collateralAccountId={collateralAccountId ?? ''}
-            debtRepaidAmountUserCurrency={confirmedQuote?.quoteDebtRepaidAmountUserCurrency ?? '0'}
-            borderTopWidth={0}
-            mt={0}
-          />
-          <CardFooter px={4} py={4}>
-            <Stack spacing={4} width='full'>
-              {maybeLedgerOpenAppWarning && <Box width='full'>{maybeLedgerOpenAppWarning}</Box>}
-              <Box width='full'>
-                <Button
-                  isLoading={
-                    isEstimatedFeesDataLoading ||
-                    isLendingQuoteCloseQueryRefetching ||
-                    loanTxStatus === 'pending' ||
-                    isLoanPending ||
-                    isInboundAddressLoading
-                  }
-                  disabled={
-                    loanTxStatus === 'pending' ||
-                    isLoanPending ||
-                    isLendingQuoteCloseQueryRefetching ||
-                    isEstimatedFeesDataLoading ||
-                    isInboundAddressLoading ||
-                    isEstimatedFeesDataError ||
-                    !confirmedQuote
-                  }
-                  onClick={handleConfirm}
-                  colorScheme='blue'
-                  size='lg'
-                  width='full'
-                >
-                  {translate(confirmTranslation)}
-                </Button>
-              </Box>
-            </Stack>
-          </CardFooter>
-        </Stack>
-      </Flex>
-    </SlideTransition>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Repay/RepayInput.tsx b/src/pages/Lending/Pool/components/Repay/RepayInput.tsx
deleted file mode 100644
index b5c2bc8fd75..00000000000
--- a/src/pages/Lending/Pool/components/Repay/RepayInput.tsx
+++ /dev/null
@@ -1,778 +0,0 @@
-import { ArrowDownIcon, WarningIcon } from '@chakra-ui/icons'
-import {
-  Button,
-  Collapse,
-  Divider,
-  Flex,
-  Heading,
-  IconButton,
-  Skeleton,
-  Slider,
-  SliderFilledTrack,
-  SliderThumb,
-  SliderTrack,
-  Stack,
-  Tooltip,
-} from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAccountId } from '@shapeshiftoss/caip'
-import { assertAndProcessMemo, SwapperName } from '@shapeshiftoss/swapper'
-import type { Asset } from '@shapeshiftoss/types'
-import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { useQuery } from '@tanstack/react-query'
-import prettyMilliseconds from 'pretty-ms'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import { LoanSummary } from '../LoanSummary'
-import { RepayRoutePaths } from './types'
-
-import { Amount } from '@/components/Amount/Amount'
-import { TradeAssetSelect } from '@/components/AssetSelection/AssetSelection'
-import { ButtonWalletPredicate } from '@/components/ButtonWalletPredicate/ButtonWalletPredicate'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { TradeAssetInput } from '@/components/MultiHopTrade/components/TradeAssetInput'
-import { Row } from '@/components/Row/Row'
-import { RawText, Text } from '@/components/Text'
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { useApprove } from '@/hooks/mutations/useApprove'
-import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
-import { useIsSmartContractAddress } from '@/hooks/useIsSmartContractAddress/useIsSmartContractAddress'
-import { useModal } from '@/hooks/useModal/useModal'
-import { useToggle } from '@/hooks/useToggle/useToggle'
-import { BigNumber, bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { getMaybeCompositeAssetSymbol } from '@/lib/mixpanel/helpers'
-import { getMixPanel } from '@/lib/mixpanel/mixPanelSingleton'
-import { MixPanelEvent } from '@/lib/mixpanel/types'
-import { THORCHAIN_AFFILIATE_NAME } from '@/lib/utils/thorchain/constants'
-import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
-import type { LendingQuoteClose } from '@/lib/utils/thorchain/lending/types'
-import { useLendingQuoteCloseQuery } from '@/pages/Lending/hooks/useLendingCloseQuery'
-import { useLendingPositionData } from '@/pages/Lending/hooks/useLendingPositionData'
-import { useLendingSupportedAssets } from '@/pages/Lending/hooks/useLendingSupportedAssets'
-import { reactQueries } from '@/react-queries'
-import { selectInboundAddressData } from '@/react-queries/selectors'
-import {
-  selectAccountNumberByAccountId,
-  selectAssetById,
-  selectAssets,
-  selectFeeAssetById,
-  selectPortfolioCryptoBalanceByFilter,
-  selectTxById,
-} from '@/state/slices/selectors'
-import { serializeTxIndex } from '@/state/slices/txHistorySlice/utils'
-import { store, useAppSelector } from '@/state/store'
-const formControlProps = {
-  borderRadius: 0,
-  background: 'transparent',
-  borderWidth: 0,
-  paddingBottom: 0,
-}
-
-type RepayInputProps = {
-  isAccountSelectionDisabled?: boolean
-  collateralAssetId: AssetId
-  repaymentPercent: number
-  onRepaymentPercentChange: (value: number) => void
-  collateralAccountId: AccountId | null
-  repaymentAccountId: AccountId | null
-  onCollateralAccountIdChange: (accountId: AccountId) => void
-  onRepaymentAccountIdChange: (accountId: AccountId) => void
-  repaymentAsset: Asset | null
-  setRepaymentAsset: (asset: Asset) => void
-  confirmedQuote: LendingQuoteClose | null
-  setConfirmedQuote: (quote: LendingQuoteClose | null) => void
-}
-
-const percentOptions = [0]
-
-export const RepayInput = ({
-  collateralAssetId,
-  repaymentPercent,
-  isAccountSelectionDisabled,
-  onRepaymentPercentChange,
-  onCollateralAccountIdChange: handleCollateralAccountIdChange,
-  collateralAccountId,
-  repaymentAccountId,
-  onRepaymentAccountIdChange: handleRepaymentAccountIdChange,
-  repaymentAsset,
-  setRepaymentAsset,
-  confirmedQuote,
-  setConfirmedQuote,
-}: RepayInputProps) => {
-  const [seenNotice, setSeenNotice] = useState(false)
-  const [repaymentAssetIsFiat, toggleRepaymentAssetIsFiat] = useToggle(false)
-  const [collateralAssetIsFiat, toggleCollateralAssetIsFiat] = useToggle(false)
-  const translate = useTranslate()
-  const navigate = useNavigate()
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-  const repaymentFeeAsset = useAppSelector(state =>
-    selectFeeAssetById(state, repaymentAsset?.assetId ?? ''),
-  )
-  const collateralFeeAsset = useAppSelector(state => selectFeeAssetById(state, collateralAssetId))
-
-  const repaymentAccountNumberFilter = useMemo(
-    () => ({ accountId: repaymentAccountId ?? '' }),
-    [repaymentAccountId],
-  )
-  const repaymentAccountNumber = useAppSelector(state =>
-    selectAccountNumberByAccountId(state, repaymentAccountNumberFilter),
-  )
-
-  const userAddress = useMemo(() => {
-    if (!repaymentAccountId) return ''
-
-    return fromAccountId(repaymentAccountId).account
-  }, [repaymentAccountId])
-
-  const { data: inboundAddressData, isLoading: isInboundAddressLoading } = useQuery({
-    ...reactQueries.thornode.inboundAddresses(),
-    staleTime: 60_000,
-    select: data => selectInboundAddressData(data, repaymentAsset?.assetId, SwapperName.Thorchain),
-    enabled: !!repaymentAsset?.assetId,
-  })
-
-  const {
-    approveMutation: {
-      mutate,
-      isPending: isApprovalMutationPending,
-      isSuccess: isApprovalMutationSuccess,
-    },
-    approvalFeesQuery: { data: approvalFeesData, isLoading: isApprovalFeesDataLoading },
-    approvalTxHash,
-    setApprovalTxHash,
-    isApprovalRequired,
-    allowanceDataQuery: { isLoading: isAllowanceDataLoading },
-  } = useApprove({
-    assetId: repaymentAsset?.assetId,
-    spender: inboundAddressData?.router,
-    from: userAddress,
-    amountCryptoBaseUnit:
-      confirmedQuote?.repaymentAmountCryptoPrecision && repaymentAsset
-        ? // Add 5% buffer to the repayment allowance to avoid asset rates fluctuations ending up in more asset needed to repay
-          bnOrZero(confirmedQuote.repaymentAmountCryptoPrecision)
-            .times('1.05')
-            .times(bn(10).pow(repaymentAsset.precision))
-            .toFixed(0, BigNumber.ROUND_UP)
-        : undefined,
-    accountNumber: repaymentAccountNumber,
-  })
-
-  const useLendingQuoteCloseQueryArgs = useMemo(
-    () => ({
-      collateralAssetId,
-      collateralAccountId,
-      repaymentAssetId: repaymentAsset?.assetId ?? '',
-      repaymentPercent,
-      repaymentAccountId,
-      // If we have an approval Txid, we don't want to refetch the quote
-      // Else, they may get a worse rate i.e need to pay more token, meaning their approval wouldn't be valid
-      // anymore for the new quote
-      enabled: !isApprovalRequired,
-    }),
-    [
-      collateralAccountId,
-      collateralAssetId,
-      isApprovalRequired,
-      repaymentAccountId,
-      repaymentAsset?.assetId,
-      repaymentPercent,
-    ],
-  )
-
-  const {
-    data: lendingQuoteCloseData,
-    isLoading: isLendingQuoteCloseLoading,
-    isRefetching: isLendingQuoteCloseRefetching,
-    isSuccess: isLendingQuoteCloseSuccess,
-    isError: isLendingQuoteCloseError,
-    error: lendingQuoteCloseError,
-  } = useLendingQuoteCloseQuery(useLendingQuoteCloseQueryArgs)
-
-  const isThorchainLendingRepayEnabled = useFeatureFlag('ThorchainLendingRepay')
-
-  useEffect(() => {
-    setConfirmedQuote(lendingQuoteCloseData ?? null)
-  }, [lendingQuoteCloseData, setConfirmedQuote])
-
-  const mixpanel = getMixPanel()
-
-  const repaymentAssetBalanceFilter = useMemo(
-    () => ({ assetId: repaymentAsset?.assetId ?? '', accountId: repaymentAccountId ?? '' }),
-    [repaymentAsset?.assetId, repaymentAccountId],
-  )
-
-  const repaymentAssetAmountAvailableCryptoPrecision = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, repaymentAssetBalanceFilter),
-  ).toPrecision()
-  const feeAssetBalanceFilter = useMemo(
-    () => ({ assetId: repaymentFeeAsset?.assetId ?? '', accountId: repaymentAccountId ?? '' }),
-    [repaymentFeeAsset?.assetId, repaymentAccountId],
-  )
-  const feeAssetBalanceCryptoBaseUnit = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByFilter(state, feeAssetBalanceFilter),
-  ).toBaseUnit()
-
-  const serializedApprovalTxIndex = useMemo(() => {
-    if (!(approvalTxHash && userAddress && repaymentAccountId)) return ''
-    return serializeTxIndex(repaymentAccountId, approvalTxHash, userAddress)
-  }, [approvalTxHash, userAddress, repaymentAccountId])
-  const approvalTx = useAppSelector(gs => selectTxById(gs, serializedApprovalTxIndex))
-  const isApprovalTxPending = useMemo(
-    () =>
-      isApprovalMutationPending ||
-      (isApprovalMutationSuccess && approvalTx?.status !== TxStatus.Confirmed),
-    [approvalTx?.status, isApprovalMutationPending, isApprovalMutationSuccess],
-  )
-
-  useEffect(() => {
-    if (!approvalTx) return
-    if (isApprovalTxPending) return
-    ;(async () => {
-      await queryClient.invalidateQueries(
-        reactQueries.common.allowanceCryptoBaseUnit(
-          repaymentAsset?.assetId,
-          inboundAddressData?.router,
-          userAddress,
-        ),
-      )
-    })()
-  }, [
-    approvalTx,
-    inboundAddressData?.router,
-    isApprovalTxPending,
-    repaymentAsset?.assetId,
-    userAddress,
-  ])
-
-  const handleApprove = useCallback(() => mutate(undefined), [mutate])
-
-  const onSubmit = useCallback(() => {
-    if (!lendingQuoteCloseData) return
-
-    if (isApprovalRequired) return handleApprove()
-
-    setConfirmedQuote(lendingQuoteCloseData)
-
-    if (mixpanel) {
-      const assets = selectAssets(store.getState())
-
-      const compositeRepaymentAsset = getMaybeCompositeAssetSymbol(
-        repaymentAsset?.assetId ?? '',
-        assets,
-      )
-      const compositeCollateralAsset = getMaybeCompositeAssetSymbol(
-        collateralAsset?.assetId ?? '',
-        assets,
-      )
-
-      const eventData = {
-        repaymentAsset: compositeRepaymentAsset,
-        collateralAsset: compositeCollateralAsset,
-        repaymentAssetChain: repaymentFeeAsset?.networkName,
-        collateralAssetChain: collateralFeeAsset?.networkName,
-        totalFeesUserCurrency: bn(lendingQuoteCloseData.quoteTotalFeesFiatUserCurrency).toFixed(2),
-        totalFeesUsd: bn(lendingQuoteCloseData.quoteTotalFeesFiatUsd).toFixed(2),
-        repaymentPercent,
-        repaymentAmountUserCurrency: bnOrZero(
-          lendingQuoteCloseData.repaymentAmountFiatUserCurrency,
-        ).toFixed(2),
-        repaymentAmountUsd: bnOrZero(lendingQuoteCloseData.repaymentAmountFiatUsd).toFixed(2),
-        repaymentAmountCryptoPrecision: lendingQuoteCloseData.repaymentAmountCryptoPrecision,
-        debtRepaidAmountUserCurrency: bn(
-          lendingQuoteCloseData.quoteDebtRepaidAmountUserCurrency,
-        ).toFixed(2),
-        debtRepaidAmountUsd: bn(lendingQuoteCloseData.quoteDebtRepaidAmountUsd).toFixed(2),
-        collateralDecreaseCryptoPrecision:
-          lendingQuoteCloseData.quoteLoanCollateralDecreaseCryptoPrecision,
-        collateralDecreaseUserCurrency: bn(
-          lendingQuoteCloseData.quoteLoanCollateralDecreaseFiatUserCurrency,
-        ).toFixed(2),
-        collateralDecreaseUsd: bn(lendingQuoteCloseData.quoteLoanCollateralDecreaseFiatUsd).toFixed(
-          2,
-        ),
-      }
-      mixpanel.track(MixPanelEvent.RepayPreview, eventData)
-    }
-
-    navigate(RepayRoutePaths.Confirm)
-  }, [
-    collateralAsset?.assetId,
-    collateralFeeAsset?.networkName,
-    handleApprove,
-    navigate,
-    isApprovalRequired,
-    lendingQuoteCloseData,
-    mixpanel,
-    repaymentAsset?.assetId,
-    repaymentFeeAsset?.networkName,
-    repaymentPercent,
-    setConfirmedQuote,
-  ])
-
-  const swapIcon = useMemo(() => <ArrowDownIcon />, [])
-
-  const { data: supportedRepaymentAssets, isLoading: isSupportedRepaymentAssetsLoading } =
-    useLendingSupportedAssets({ type: 'borrow' })
-  const repaymentAssetIds = useMemo(
-    () => supportedRepaymentAssets?.map(asset => asset.assetId) ?? [],
-    [supportedRepaymentAssets],
-  )
-
-  useEffect(() => {
-    if (!(supportedRepaymentAssets && collateralAsset)) return
-    if (repaymentAsset) return
-
-    setRepaymentAsset(collateralAsset)
-  }, [collateralAsset, supportedRepaymentAssets, repaymentAsset, setRepaymentAsset])
-
-  const buyAssetSearch = useModal('buyAssetSearch')
-
-  const handleRepaymentAssetClick = useCallback(() => {
-    buyAssetSearch.open({
-      onAssetClick: setRepaymentAsset,
-      title: 'lending.repay',
-      assets: supportedRepaymentAssets ?? [],
-    })
-  }, [buyAssetSearch, supportedRepaymentAssets, setRepaymentAsset])
-
-  const handleRepaymentAssetChange = useCallback(
-    (asset: Asset) => {
-      setRepaymentAsset(asset)
-      setApprovalTxHash(null)
-    },
-    [setApprovalTxHash, setRepaymentAsset],
-  )
-
-  const repaymentAssetSelectComponent = useMemo(() => {
-    return (
-      <TradeAssetSelect
-        assetId={repaymentAsset?.assetId ?? ''}
-        assetIds={repaymentAssetIds}
-        onAssetClick={handleRepaymentAssetClick}
-        onAssetChange={handleRepaymentAssetChange}
-        // Users have the possibility to repay in any supported asset, not only their collateral/borrowed asset
-        // https://docs.thorchain.org/thorchain-finance/lending#loan-repayment-closeflow
-        isReadOnly={false}
-        onlyConnectedChains={true}
-      />
-    )
-  }, [
-    repaymentAsset?.assetId,
-    repaymentAssetIds,
-    handleRepaymentAssetClick,
-    handleRepaymentAssetChange,
-  ])
-
-  const collateralAssetSelectComponent = useMemo(() => {
-    return (
-      <TradeAssetSelect
-        assetId={collateralAssetId}
-        isReadOnly
-        isLoading={isSupportedRepaymentAssetsLoading}
-        onlyConnectedChains={true}
-      />
-    )
-  }, [collateralAssetId, isSupportedRepaymentAssetsLoading])
-
-  const handleSeenNotice = useCallback(() => setSeenNotice(true), [])
-
-  const {
-    data: lendingPositionData,
-    isLoading: isLendingPositionDataLoading,
-    isError: isLendingPositionDataError,
-    isSuccess: isLendingPositionDataSuccess,
-  } = useLendingPositionData({
-    assetId: collateralAssetId,
-    accountId: collateralAccountId,
-  })
-
-  const memo = useMemo(() => {
-    if (!confirmedQuote) return null
-
-    return assertAndProcessMemo(confirmedQuote.quoteMemo, THORCHAIN_AFFILIATE_NAME)
-  }, [confirmedQuote])
-
-  const hasEnoughBalanceForTx = useMemo(() => {
-    if (!(repaymentFeeAsset && repaymentAsset)) return
-
-    return bnOrZero(lendingQuoteCloseData?.repaymentAmountCryptoPrecision).lte(
-      repaymentAssetAmountAvailableCryptoPrecision,
-    )
-  }, [
-    repaymentFeeAsset,
-    repaymentAsset,
-    lendingQuoteCloseData,
-    repaymentAssetAmountAvailableCryptoPrecision,
-  ])
-
-  const { estimatedFeesData, isEstimatedFeesDataLoading, isEstimatedFeesDataError } = useSendThorTx(
-    {
-      assetId: repaymentAsset?.assetId ?? '',
-      accountId: repaymentAccountId,
-      amountCryptoBaseUnit: BigAmount.fromPrecision({
-        value: confirmedQuote?.repaymentAmountCryptoPrecision ?? 0,
-        precision: repaymentAsset?.precision ?? 0,
-      }).toBaseUnit(),
-      memo,
-      // no explicit from address required for repayments
-      fromAddress: '',
-      action: 'repayLoan',
-      enableEstimateFees: isApprovalRequired === false,
-    },
-  )
-
-  const fees = useMemo(
-    () => approvalFeesData || estimatedFeesData,
-    [approvalFeesData, estimatedFeesData],
-  )
-
-  const hasEnoughBalanceForTxPlusFees = useMemo(() => {
-    if (!(repaymentFeeAsset && repaymentAsset)) return
-
-    if (!fees) return true
-
-    // Native asset
-    if (repaymentFeeAsset.assetId === repaymentAsset.assetId)
-      return bnOrZero(lendingQuoteCloseData?.repaymentAmountCryptoPrecision)
-        .plus(
-          bnOrZero(
-            BigAmount.fromBaseUnit({
-              value: estimatedFeesData?.txFeeCryptoBaseUnit ?? '0',
-              precision: repaymentAsset.precision ?? 0,
-            }).toPrecision(),
-          ),
-        )
-        .lte(repaymentAssetAmountAvailableCryptoPrecision)
-
-    // Token - fees can either be network fees or approval fees
-    const txFeeCryptoBaseUnit =
-      'txFeeCryptoBaseUnit' in fees ? fees.txFeeCryptoBaseUnit : fees.networkFeeCryptoBaseUnit
-    return (
-      bnOrZero(lendingQuoteCloseData?.repaymentAmountCryptoPrecision).lte(
-        repaymentAssetAmountAvailableCryptoPrecision,
-      ) && bnOrZero(txFeeCryptoBaseUnit).lte(feeAssetBalanceCryptoBaseUnit)
-    )
-  }, [
-    repaymentFeeAsset,
-    repaymentAsset,
-    fees,
-    lendingQuoteCloseData?.repaymentAmountCryptoPrecision,
-    estimatedFeesData?.txFeeCryptoBaseUnit,
-    repaymentAssetAmountAvailableCryptoPrecision,
-    feeAssetBalanceCryptoBaseUnit,
-  ])
-
-  const { data: _isSmartContractAddress, isLoading: isAddressByteCodeLoading } =
-    useIsSmartContractAddress(userAddress, repaymentAsset?.chainId ?? '')
-
-  const disableSmartContractRepayment = useMemo(() => {
-    // This is either a smart contract address, or the bytecode is still loading - disable confirm
-    if (_isSmartContractAddress) return true
-
-    // All checks passed - this is an EOA address
-    return false
-  }, [_isSmartContractAddress])
-
-  const quoteErrorTranslation = useMemo(() => {
-    if (!isThorchainLendingRepayEnabled) return translate('lending.errors.repaymentsDisabled')
-    if (_isSmartContractAddress) return translate('trade.errors.smartContractWalletNotSupported')
-    if (lendingQuoteCloseData && (!hasEnoughBalanceForTxPlusFees || !hasEnoughBalanceForTx))
-      return translate('common.insufficientFunds')
-    if (isLendingQuoteCloseError) {
-      if (
-        /not enough fee/i.test(lendingQuoteCloseError.message) ||
-        /not enough to pay transaction fee/i.test(lendingQuoteCloseError.message)
-      )
-        return translate(
-          repaymentPercent === 100
-            ? 'lending.errors.amountTooLowToReturnCollateral'
-            : 'trade.errors.amountTooSmallUnknownMinimum',
-        )
-      if (
-        /loan hasn't reached maturity/i.test(lendingQuoteCloseError.message) ||
-        /loan repayment is unavailable/i.test(lendingQuoteCloseError.message)
-      )
-        return translate('lending.repaymentUnavailable')
-
-      if (/trading is halted/i.test(lendingQuoteCloseError.message))
-        return translate('lending.errors.repaymentsHalted')
-
-      // This should never happen but it may
-      // https://gitlab.com/thorchain/thornode/-/blob/051fafb06011e135e6b122600b5b023b7704d594/x/thorchain/handler_loan_repayment.go#L95
-      if (/loan contains no collateral to redeem/i.test(lendingQuoteCloseError.message)) {
-        console.error(
-          'No collateral found. Ensure the loan_owner parameter is the correct address for the position',
-        )
-      }
-    }
-    return null
-  }, [
-    _isSmartContractAddress,
-    hasEnoughBalanceForTx,
-    hasEnoughBalanceForTxPlusFees,
-    isLendingQuoteCloseError,
-    isThorchainLendingRepayEnabled,
-    lendingQuoteCloseData,
-    lendingQuoteCloseError?.message,
-    repaymentPercent,
-    translate,
-  ])
-
-  const quoteErrorTooltipTranslation = useMemo(() => {
-    if (!isLendingQuoteCloseError) return ''
-
-    if (
-      /not enough fee/i.test(lendingQuoteCloseError.message) ||
-      /not enough to pay transaction fee/i.test(lendingQuoteCloseError.message)
-    )
-      return translate(
-        repaymentPercent === 100
-          ? 'lending.errors.amountTooLowToReturnCollateralTooltip'
-          : 'lending.errors.amountTooSmallUnknownMinimumTooltip',
-      )
-    if (
-      /loan hasn't reached maturity/i.test(lendingQuoteCloseError.message) ||
-      /loan repayment is unavailable/i.test(lendingQuoteCloseError.message)
-    )
-      return translate('lending.errors.repaymentUnavailableTooltip')
-
-    if (/trading is halted/i.test(lendingQuoteCloseError.message))
-      return translate('lending.errors.repaymentsHaltedTooltip')
-
-    return ''
-  }, [isLendingQuoteCloseError, lendingQuoteCloseError?.message, repaymentPercent, translate])
-
-  const confirmTranslation = useMemo(() => {
-    if (isApprovalRequired && repaymentAsset)
-      return translate(`transactionRow.parser.erc20.approveSymbol`, {
-        symbol: repaymentAsset.symbol,
-      })
-    return translate('lending.repay')
-  }, [isApprovalRequired, repaymentAsset, translate])
-
-  if (!seenNotice) {
-    return (
-      <Stack spacing={6} px={4} py={6} textAlign='center' alignItems='center'>
-        <WarningIcon color='text.warning' boxSize={12} />
-        <Stack spacing={0} px={2}>
-          <Heading as='h4'>{translate('lending.repayNoticeTitle')}</Heading>
-          <Text color='text.subtle' translation='lending.repayNotice' />
-        </Stack>
-        <Button width='full' size='lg' colorScheme='blue' onClick={handleSeenNotice}>
-          {translate('lending.repayNoticeCta')}
-        </Button>
-      </Stack>
-    )
-  }
-
-  return (
-    <Stack spacing={0} data-testid='lending-repay-input'>
-      <TradeAssetInput
-        assetId={repaymentAsset?.assetId ?? ''}
-        assetSymbol={repaymentAsset?.symbol ?? ''}
-        assetIcon={''}
-        cryptoAmount={lendingQuoteCloseData?.repaymentAmountCryptoPrecision ?? '0'}
-        fiatAmount={lendingQuoteCloseData?.repaymentAmountFiatUserCurrency ?? '0'}
-        isSendMaxDisabled={false}
-        isReadOnly
-        onToggleIsFiat={toggleRepaymentAssetIsFiat}
-        isFiat={repaymentAssetIsFiat}
-        percentOptions={percentOptions}
-        showInputSkeleton={isLendingQuoteCloseLoading || isLendingQuoteCloseRefetching}
-        showFiatSkeleton={isLendingQuoteCloseLoading || isLendingQuoteCloseRefetching}
-        label={translate('lending.repayAmount')}
-        onAccountIdChange={handleRepaymentAccountIdChange}
-        formControlProps={formControlProps}
-        layout='inline'
-        labelPostFix={repaymentAssetSelectComponent}
-        hideAmounts={isLendingQuoteCloseError}
-      >
-        <Stack spacing={4} px={6} pb={4}>
-          <Slider defaultValue={100} onChange={onRepaymentPercentChange}>
-            <SliderTrack>
-              <SliderFilledTrack bg='blue.500' />
-            </SliderTrack>
-            <Tooltip label={translate('lending.repayNotice')}>
-              <SliderThumb boxSize={4} />
-            </Tooltip>
-          </Slider>
-          <Flex width='full' justifyContent='space-between' fontSize='xs' color='text.subtle'>
-            <Skeleton isLoaded={isLendingPositionDataSuccess}>
-              <Amount.Fiat value={0} />
-            </Skeleton>
-            <Skeleton isLoaded={isLendingPositionDataSuccess}>
-              {/* Actually defined at display time, see isLoaded above */}
-              <Amount.Fiat value={lendingPositionData?.debtBalanceFiatUserCurrency ?? '0'} />
-            </Skeleton>
-          </Flex>
-        </Stack>
-      </TradeAssetInput>
-      <Flex alignItems='center' justifyContent='center' my={-2}>
-        <Divider />
-        <IconButton
-          isRound
-          size='sm'
-          position='relative'
-          variant='outline'
-          borderColor='border.base'
-          zIndex={1}
-          aria-label={translate('lending.switchAssets')}
-          icon={swapIcon}
-        />
-        <Divider />
-      </Flex>
-      <TradeAssetInput
-        accountId={collateralAccountId ?? ''}
-        assetId={collateralAssetId}
-        assetSymbol={collateralAsset?.symbol ?? ''}
-        assetIcon={collateralAsset?.icon ?? ''}
-        // Both cryptoAmount and fiatAmount actually defined at display time, see showFiatSkeleton below
-        cryptoAmount={lendingQuoteCloseData?.quoteWithdrawnAmountAfterFeesCryptoPrecision ?? '0'}
-        fiatAmount={lendingQuoteCloseData?.quoteWithdrawnAmountAfterFeesUserCurrency ?? '0'}
-        isAccountSelectionDisabled={isAccountSelectionDisabled}
-        isSendMaxDisabled={false}
-        percentOptions={percentOptions}
-        showInputSkeleton={isLendingQuoteCloseLoading || isLendingQuoteCloseRefetching}
-        showFiatSkeleton={isLendingQuoteCloseLoading || isLendingQuoteCloseRefetching}
-        label={translate('lending.unlockedCollateral')}
-        onAccountIdChange={handleCollateralAccountIdChange}
-        isReadOnly
-        onToggleIsFiat={toggleCollateralAssetIsFiat}
-        isFiat={collateralAssetIsFiat}
-        // When repaying 100% of the loan, the user gets their collateral back
-        hideAmounts={bn(repaymentPercent).lt(100)}
-        formControlProps={formControlProps}
-        layout='inline'
-        labelPostFix={collateralAssetSelectComponent}
-      />
-      <Collapse in={isLendingQuoteCloseSuccess} unmountOnExit>
-        <LoanSummary
-          confirmedQuote={confirmedQuote}
-          isLoading={isLendingQuoteCloseLoading || isLendingQuoteCloseRefetching}
-          collateralAssetId={collateralAssetId}
-          repayAmountCryptoPrecision={lendingQuoteCloseData?.repaymentAmountCryptoPrecision ?? '0'}
-          debtRepaidAmountUserCurrency={
-            lendingQuoteCloseData?.quoteDebtRepaidAmountUserCurrency ?? '0'
-          }
-          repaymentAsset={repaymentAsset}
-          repaymentPercent={repaymentPercent}
-          collateralDecreaseAmountCryptoPrecision={
-            lendingQuoteCloseData?.quoteLoanCollateralDecreaseCryptoPrecision ?? '0'
-          }
-          repaymentAccountId={repaymentAccountId ?? ''}
-          collateralAccountId={collateralAccountId ?? ''}
-        />
-        <Stack
-          borderTopWidth={1}
-          borderColor='border.subtle'
-          flexDir='column'
-          gap={4}
-          px={6}
-          py={4}
-          bg='background.surface.raised.accent'
-        >
-          <Row fontSize='sm' fontWeight='medium'>
-            <Row.Label>{translate('common.slippage')}</Row.Label>
-            <Row.Value>
-              <Skeleton isLoaded={isLendingQuoteCloseSuccess && !isLendingQuoteCloseRefetching}>
-                <Amount.Crypto
-                  // Actually defined at display time, see isLoaded above
-                  value={lendingQuoteCloseData?.quoteSlippageWithdrawnAssetCryptoPrecision ?? '0'}
-                  symbol={collateralAsset?.symbol ?? ''}
-                />
-              </Skeleton>
-            </Row.Value>
-          </Row>
-          <Skeleton isLoaded={Boolean(fees)}>
-            <Row fontSize='sm' fontWeight='medium'>
-              <Row.Label>
-                {translate(isApprovalRequired ? 'common.approvalFee' : 'common.gasFee')}
-              </Row.Label>
-              <Row.Value>
-                {/* Nested skeleton on purpose - approval required may be detected, but fees still fetching */}
-                <Skeleton isLoaded={Boolean(fees)}>
-                  <Amount.Fiat value={fees?.txFeeFiat ?? '0'} />
-                </Skeleton>
-              </Row.Value>
-            </Row>
-          </Skeleton>
-          <Row fontSize='sm' fontWeight='medium'>
-            <HelperTooltip label={translate('lending.feesNotice')}>
-              <Row.Label>{translate('common.fees')}</Row.Label>
-            </HelperTooltip>
-            <Row.Value>
-              <Skeleton isLoaded={isLendingQuoteCloseSuccess && !isLendingQuoteCloseRefetching}>
-                <Amount.Fiat value={lendingQuoteCloseData?.quoteTotalFeesFiatUserCurrency ?? 0} />
-              </Skeleton>
-            </Row.Value>
-          </Row>
-          <Row fontSize='sm' fontWeight='medium'>
-            <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
-            <Row.Value>
-              <Skeleton isLoaded={isLendingQuoteCloseSuccess && !isLendingQuoteCloseRefetching}>
-                <RawText fontWeight='bold'>
-                  {prettyMilliseconds(lendingQuoteCloseData?.quoteTotalTimeMs ?? 0)}
-                </RawText>
-              </Skeleton>
-            </Row.Value>
-          </Row>
-        </Stack>
-      </Collapse>
-      <Stack
-        borderTopWidth={1}
-        borderColor='border.subtle'
-        flexDir='column'
-        gap={4}
-        px={6}
-        py={4}
-        bg='background.surface.raised.accent'
-        borderBottomRadius='xl'
-      >
-        <Tooltip label={quoteErrorTooltipTranslation} isDisabled={!lendingQuoteCloseError}>
-          <ButtonWalletPredicate
-            isValidWallet={!disableSmartContractRepayment}
-            isDisabled={Boolean(
-              !isThorchainLendingRepayEnabled ||
-                isApprovalTxPending ||
-                isInboundAddressLoading ||
-                isAllowanceDataLoading ||
-                isLendingPositionDataLoading ||
-                isLendingPositionDataError ||
-                isLendingQuoteCloseLoading ||
-                isLendingQuoteCloseRefetching ||
-                isEstimatedFeesDataLoading ||
-                isApprovalFeesDataLoading ||
-                isLendingQuoteCloseError ||
-                isEstimatedFeesDataError ||
-                quoteErrorTranslation,
-            )}
-            size='lg-multiline'
-            colorScheme={
-              isLendingQuoteCloseError || isEstimatedFeesDataError || quoteErrorTranslation
-                ? 'red'
-                : 'blue'
-            }
-            mx={-2}
-            onClick={onSubmit}
-            isLoading={
-              isApprovalTxPending ||
-              isLendingPositionDataLoading ||
-              isLendingQuoteCloseLoading ||
-              isLendingQuoteCloseRefetching ||
-              isEstimatedFeesDataLoading ||
-              isApprovalFeesDataLoading ||
-              isAddressByteCodeLoading ||
-              isInboundAddressLoading ||
-              isAllowanceDataLoading
-            }
-          >
-            {quoteErrorTranslation ? quoteErrorTranslation : confirmTranslation}
-          </ButtonWalletPredicate>
-        </Tooltip>
-      </Stack>
-    </Stack>
-  )
-}
diff --git a/src/pages/Lending/Pool/components/Repay/types.ts b/src/pages/Lending/Pool/components/Repay/types.ts
deleted file mode 100644
index cded8ea2973..00000000000
--- a/src/pages/Lending/Pool/components/Repay/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum RepayRoutePaths {
-  Input = '/repay/input',
-  Confirm = '/repay/confirm',
-}
diff --git a/src/pages/Lending/YourLoans.tsx b/src/pages/Lending/YourLoans.tsx
deleted file mode 100644
index 39775364128..00000000000
--- a/src/pages/Lending/YourLoans.tsx
+++ /dev/null
@@ -1,308 +0,0 @@
-import type { GridProps } from '@chakra-ui/react'
-import { Button, Flex, SimpleGrid, Skeleton, Stack } from '@chakra-ui/react'
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import type { Asset } from '@shapeshiftoss/types'
-import type { InterpolationOptions } from 'node-polyglot'
-import { useCallback, useMemo } from 'react'
-import { FaWallet } from 'react-icons/fa'
-import { RiExchangeFundsLine } from 'react-icons/ri'
-import { useTranslate } from 'react-polyglot'
-import { generatePath, useNavigate } from 'react-router-dom'
-
-import { LendingHeader } from './components/LendingHeader'
-import { useAllLendingPositionsData } from './hooks/useAllLendingPositionsData'
-import { useLendingPositionData } from './hooks/useLendingPositionData'
-import { useLendingSupportedAssets } from './hooks/useLendingSupportedAssets'
-import { useRepaymentLockData } from './hooks/useRepaymentLockData'
-
-import { Amount } from '@/components/Amount/Amount'
-import { ButtonWalletPredicate } from '@/components/ButtonWalletPredicate/ButtonWalletPredicate'
-import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
-import { Main } from '@/components/Layout/Main'
-import { SEO } from '@/components/Layout/Seo'
-import { ResultsEmpty } from '@/components/ResultsEmpty'
-import { AssetCell } from '@/components/StakingVaults/Cells'
-import { RawText, Text } from '@/components/Text'
-import type { TextPropTypes } from '@/components/Text/Text'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { isSome } from '@/lib/utils'
-import { selectAccountNumberByAccountId } from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-const emptyIcon = <RiExchangeFundsLine color='pink.200' />
-
-export const lendingRowGrid: GridProps['gridTemplateColumns'] = {
-  base: 'minmax(150px, 1fr) repeat(1, minmax(40px, max-content))',
-  lg: '200px repeat(3, 1fr)',
-  xl: '200px repeat(4, 1fr)',
-}
-const reverseMobileDisplay = {
-  base: 'block',
-  lg: 'none',
-}
-const mobileDisplay = {
-  base: 'none',
-  lg: 'flex',
-}
-
-const largeDisplay = {
-  base: 'none',
-  xl: 'flex',
-}
-
-const mobilePadding = {
-  base: 4,
-  lg: 4,
-  xl: 0,
-}
-
-const listMargin = {
-  base: 0,
-  lg: 0,
-  xl: -4,
-}
-
-const alignItems = {
-  base: 'flex-end',
-  lg: 'flex-start',
-}
-
-type LendingRowGridProps = {
-  asset: Asset
-  accountId: AccountId
-  onPoolClick: (assetId: AssetId, accountId: AccountId) => void
-}
-
-const LendingRowGrid = ({ asset, accountId, onPoolClick }: LendingRowGridProps) => {
-  const translate = useTranslate()
-  const { data: lendingPositionData, isLoading: isLendingPositionDataLoading } =
-    useLendingPositionData({
-      assetId: asset.assetId,
-      accountId,
-    })
-
-  const useRepaymentLockDataArgs = useMemo(
-    () => ({
-      assetId: asset.assetId,
-      accountId,
-      // When fetching position repayment lock, we want to ensure there's an AccountId and AssetId
-      // or we would fetch the default network's repayment lock instead
-      // these should be defined according to types but you never know
-      enabled: Boolean(asset.assetId && accountId),
-    }),
-    [asset.assetId, accountId],
-  )
-  const { data: repaymentLockData, isSuccess: isRepaymentLockSuccess } =
-    useRepaymentLockData(useRepaymentLockDataArgs)
-
-  const handlePoolClick = useCallback(() => {
-    onPoolClick(asset.assetId, accountId)
-  }, [accountId, asset.assetId, onPoolClick])
-
-  const accountNumberFilter = useMemo(
-    () => ({ assetId: asset.assetId, accountId }),
-    [accountId, asset.assetId],
-  )
-  const accountNumber = useAppSelector(s => selectAccountNumberByAccountId(s, accountNumberFilter))
-  const accountNumberTranslation: TextPropTypes['translation'] = useMemo(
-    () => ['accounts.accountNumber', { accountNumber }],
-    [accountNumber],
-  )
-
-  const isRepaymentLocked = bnOrZero(repaymentLockData).gt(0)
-
-  if (
-    lendingPositionData &&
-    bnOrZero(lendingPositionData.collateralBalanceCryptoPrecision)
-      .plus(lendingPositionData.debtBalanceFiatUserCurrency)
-      .isZero()
-  )
-    return null
-
-  return (
-    <Stack mx={listMargin}>
-      <Button
-        variant='ghost'
-        display='grid'
-        gridTemplateColumns={lendingRowGrid}
-        columnGap={4}
-        alignItems='center'
-        textAlign='left'
-        py={4}
-        width='full'
-        height='auto'
-        color='text.base'
-        onClick={handlePoolClick}
-      >
-        <AssetCell assetId={asset.assetId} />
-        <Skeleton isLoaded={!isLendingPositionDataLoading} display={mobileDisplay}>
-          <Stack spacing={0}>
-            <Text translation={accountNumberTranslation} />
-          </Stack>
-        </Skeleton>
-        <Skeleton isLoaded={!isLendingPositionDataLoading}>
-          <Stack spacing={0} alignItems={alignItems}>
-            <Amount.Fiat value={lendingPositionData?.debtBalanceFiatUserCurrency ?? '0'} />
-            <RawText
-              color={isRepaymentLocked ? 'text.subtle' : 'green.500'}
-              display={reverseMobileDisplay}
-              fontSize='xs'
-            >
-              {isRepaymentLocked
-                ? translate('lending.daysUntilRepayment', { numDays: repaymentLockData })
-                : translate('lending.repaymentAvailable')}
-            </RawText>
-          </Stack>
-        </Skeleton>
-        <Skeleton isLoaded={!isLendingPositionDataLoading} display={mobileDisplay}>
-          <Stack spacing={0}>
-            <Amount.Crypto
-              value={lendingPositionData?.collateralBalanceCryptoPrecision ?? '0'}
-              symbol={asset.symbol}
-            />
-            <Amount.Fiat
-              value={lendingPositionData?.collateralBalanceFiatUserCurrency ?? '0'}
-              fontSize='sm'
-              color='text.subtle'
-            />
-          </Stack>
-        </Skeleton>
-        <Skeleton isLoaded={isRepaymentLockSuccess} display={largeDisplay}>
-          <RawText color={isRepaymentLocked ? 'white' : 'green.500'}>
-            {isRepaymentLocked
-              ? translate('lending.repaymentDays', { numDays: repaymentLockData })
-              : translate('lending.unlocked')}
-          </RawText>
-        </Skeleton>
-      </Button>
-    </Stack>
-  )
-}
-
-const LendingRowAssetAccountsGrids = ({
-  asset,
-  onPoolClick: handlePoolClick,
-}: Omit<LendingRowGridProps, 'accountId'>) => {
-  const {
-    isLoading: isAllLendingPositionsDataLoading,
-    positions,
-    isActive,
-  } = useAllLendingPositionsData({
-    assetId: asset.assetId,
-  })
-
-  const grids = useMemo(() => {
-    if (!isActive && !isAllLendingPositionsDataLoading) return null
-    return positions
-      .map(({ data }) => data)
-      .filter(isSome)
-      .map(position => (
-        <LendingRowGrid
-          asset={asset}
-          accountId={position.accountId}
-          onPoolClick={handlePoolClick}
-        />
-      ))
-  }, [asset, handlePoolClick, isActive, isAllLendingPositionsDataLoading, positions])
-
-  return <>{grids}</>
-}
-
-export const YourLoans = () => {
-  const { isConnected } = useWallet().state
-  const translate = useTranslate()
-  const lendingHeader = useMemo(() => <LendingHeader />, [])
-
-  const { data: lendingSupportedAssets } = useLendingSupportedAssets({
-    type: 'collateral',
-  })
-
-  const navigate = useNavigate()
-
-  const handlePoolClick = useCallback(
-    (assetId: AssetId, accountId: AccountId) => {
-      navigate(generatePath('/lending/poolAccount/:accountId/:assetId', { accountId, assetId }))
-    },
-    [navigate],
-  )
-
-  const { isActive, isLoading: isAllLendingPositionsDataLoading } = useAllLendingPositionsData()
-
-  const lendingRowGrids = useMemo(() => {
-    if (!lendingSupportedAssets) return new Array(2).fill(null).map(() => <Skeleton height={16} />)
-    if (isAllLendingPositionsDataLoading) return null
-
-    return isActive ? (
-      lendingSupportedAssets.map(asset => (
-        <LendingRowAssetAccountsGrids asset={asset} onPoolClick={handlePoolClick} />
-      ))
-    ) : (
-      <ResultsEmpty
-        title='lending.yourLoans.emptyTitle'
-        body='lending.yourLoans.emptyBody'
-        icon={emptyIcon}
-      />
-    )
-  }, [handlePoolClick, isActive, isAllLendingPositionsDataLoading, lendingSupportedAssets])
-
-  const renderHeader = useMemo(() => {
-    return isActive ? (
-      <SimpleGrid
-        gridTemplateColumns={lendingRowGrid}
-        columnGap={4}
-        color='text.subtle'
-        fontWeight='bold'
-        fontSize='sm'
-        px={mobilePadding}
-      >
-        <Text translation='lending.pool' />
-        <Flex display={mobileDisplay}>
-          <HelperTooltip label={translate('assets.assetDetails.assetAccounts.account')}>
-            <Text translation='assets.assetDetails.assetAccounts.account' textAlign='right' />
-          </HelperTooltip>
-        </Flex>
-
-        <HelperTooltip label={translate('lending.outstandingDebtDescription')}>
-          <Text translation='lending.outstandingDebt' textAlign='right' />
-        </HelperTooltip>
-
-        <Flex display={mobileDisplay}>
-          <HelperTooltip label={translate('lending.collateralValueDescription')}>
-            <Text translation='lending.collateralValue' textAlign='right' />
-          </HelperTooltip>
-        </Flex>
-        <Flex display={largeDisplay}>
-          <HelperTooltip label={translate('lending.repaymentLockDescription')}>
-            <Text translation='lending.repaymentLock' textAlign='right' />
-          </HelperTooltip>
-        </Flex>
-      </SimpleGrid>
-    ) : null
-  }, [isActive, translate])
-
-  const connectWalletBody: [string, InterpolationOptions] = useMemo(
-    () => ['common.connectWalletToGetStartedWith', { feature: 'Lending' }],
-    [],
-  )
-  const connectWalletTitleButton = useMemo(() => <ButtonWalletPredicate isValidWallet />, [])
-  const connectIcon = useMemo(() => <FaWallet />, [])
-
-  return (
-    <Main headerComponent={lendingHeader} isSubPage data-testid='lending-your-loans'>
-      <SEO title={translate('lending.yourLoans.yourLoans')} />
-      {isConnected ? (
-        <Stack>
-          {renderHeader}
-          {lendingRowGrids}
-        </Stack>
-      ) : (
-        <ResultsEmpty
-          title={connectWalletTitleButton}
-          body={connectWalletBody}
-          icon={connectIcon}
-        />
-      )}
-    </Main>
-  )
-}
diff --git a/src/pages/Lending/components/LendingHeader.tsx b/src/pages/Lending/components/LendingHeader.tsx
deleted file mode 100644
index 10806865ec8..00000000000
--- a/src/pages/Lending/components/LendingHeader.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Card,
-  CardBody,
-  CardFooter,
-  Container,
-  Flex,
-  Heading,
-  Skeleton,
-  Stack,
-} from '@chakra-ui/react'
-import { useCallback, useMemo } from 'react'
-import { useTranslate } from 'react-polyglot'
-import { useNavigate } from 'react-router-dom'
-
-import { useAllLendingPositionsData } from '../hooks/useAllLendingPositionsData'
-import { useIsLendingActive } from '../hooks/useIsLendingActive'
-
-import { Amount } from '@/components/Amount/Amount'
-import { Display } from '@/components/Display'
-import type { ChartData } from '@/components/DonutChart/DonutChart'
-import { DonutChart } from '@/components/DonutChart/DonutChart'
-import { PageBackButton, PageHeader } from '@/components/Layout/Header/PageHeader'
-import type { TabItem } from '@/components/TabMenu/TabMenu'
-import { TabMenu } from '@/components/TabMenu/TabMenu'
-import { Text } from '@/components/Text'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-
-const responsiveFlex = { base: 'auto', lg: 1 }
-const containerPaddingTop = { base: 0, md: 8 }
-
-export const LendingHeader = () => {
-  const translate = useTranslate()
-  const navigate = useNavigate()
-  const NavItems: TabItem[] = useMemo(() => {
-    return [
-      {
-        label: 'lending.availablePools',
-        path: '/lending',
-        color: 'blue',
-        exact: true,
-      },
-      {
-        label: 'lending.yourLoans.yourLoans',
-        path: '/lending/loans',
-        color: 'blue',
-      },
-    ]
-  }, [])
-  const { isLendingActive, isMimirLoading } = useIsLendingActive()
-
-  const handleBack = useCallback(() => {
-    navigate('/explore')
-  }, [navigate])
-
-  const { isLoading, collateralValueUserCurrency, debtValueUserCurrency } =
-    useAllLendingPositionsData()
-  const ltv = bnOrZero(debtValueUserCurrency).div(collateralValueUserCurrency).toNumber()
-  const donutData: ChartData[] = useMemo(() => {
-    return [
-      {
-        name: 'Collateral',
-        value: bnOrZero(collateralValueUserCurrency).toNumber(),
-        color: 'green.200',
-      },
-      {
-        name: 'Debt',
-        value: bnOrZero(debtValueUserCurrency).toNumber(),
-        color: 'purple.300',
-      },
-    ]
-  }, [collateralValueUserCurrency, debtValueUserCurrency])
-
-  return (
-    <>
-      <Display.Mobile>
-        <PageHeader data-testid='lending-header'>
-          <PageHeader.Left>
-            <PageBackButton onBack={handleBack} />
-          </PageHeader.Left>
-          <PageHeader.Middle>
-            <PageHeader.Title>{translate('lending.lending')}</PageHeader.Title>
-          </PageHeader.Middle>
-        </PageHeader>
-      </Display.Mobile>
-      <Stack mb={4}>
-        <Container pt={containerPaddingTop} pb={4}>
-          <Display.Desktop>
-            <Stack>
-              <Heading>{translate('lending.lending')}</Heading>
-              <Text color='text.subtle' translation='lending.lendingBody' />
-            </Stack>
-          </Display.Desktop>
-          <Flex gap={4} my={6} flexWrap='wrap'>
-            <Card flex={responsiveFlex}>
-              <CardBody>
-                <Skeleton isLoaded={!isLoading}>
-                  <Amount.Fiat
-                    value={collateralValueUserCurrency}
-                    fontSize='4xl'
-                    fontWeight='bold'
-                  />
-                </Skeleton>
-                <Text
-                  color='text.success'
-                  fontWeight='medium'
-                  translation='lending.collateralValue'
-                />
-              </CardBody>
-            </Card>
-            <Card flex={responsiveFlex}>
-              <CardBody>
-                <Skeleton isLoaded={!isLoading}>
-                  <Amount.Fiat value={debtValueUserCurrency} fontSize='4xl' fontWeight='bold' />
-                </Skeleton>
-                <Text color='purple.300' fontWeight='medium' translation='lending.debtValue' />
-              </CardBody>
-            </Card>
-            <Card
-              flex={responsiveFlex}
-              flexDir='row'
-              justifyContent='space-between'
-              alignItems='center'
-            >
-              <CardBody>
-                <Amount.Percent value={ltv} fontSize='4xl' fontWeight='bold' />
-                <Text color='text.subtle' fontWeight='medium' translation='lending.loanToValue' />
-              </CardBody>
-              <CardFooter>
-                <DonutChart width={45} height={45} data={donutData} />
-              </CardFooter>
-            </Card>
-          </Flex>
-
-          {!isLendingActive && !isMimirLoading ? (
-            <Alert status='warning' variant='subtle'>
-              <AlertIcon />
-              <AlertDescription>{translate('lending.haltedAlert')}</AlertDescription>
-            </Alert>
-          ) : null}
-        </Container>
-        <TabMenu items={NavItems} />
-      </Stack>
-    </>
-  )
-}
diff --git a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx b/src/pages/Lending/hooks/useAllLendingPositionsData.tsx
deleted file mode 100644
index d13493f8085..00000000000
--- a/src/pages/Lending/hooks/useAllLendingPositionsData.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { useQueries } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import { useLendingSupportedAssets } from './useLendingSupportedAssets'
-
-import { bn } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import { getThorchainLendingPosition } from '@/lib/utils/thorchain/lending'
-import type { Borrower } from '@/lib/utils/thorchain/lending/types'
-import {
-  selectAccountIdsByAssetId,
-  selectEnabledWalletAccountIds,
-  selectUserCurrencyRateByAssetId,
-  selectUserCurrencyToUsdRate,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type UseAllLendingPositionsDataProps = {
-  assetId?: AssetId
-}
-
-export const useAllLendingPositionsData = ({ assetId }: UseAllLendingPositionsDataProps = {}) => {
-  const { data: lendingSupportedAssets } = useLendingSupportedAssets({
-    type: 'collateral',
-  })
-
-  const accountIds = useAppSelector(selectEnabledWalletAccountIds)
-  const accounts = useMemo(
-    () =>
-      (lendingSupportedAssets ?? [])
-        .map(asset => {
-          if (assetId && assetId !== asset.assetId) return []
-          const _accountIds = selectAccountIdsByAssetId(store.getState(), {
-            assetId: asset.assetId,
-          })
-          return _accountIds.map(accountId => ({ accountId, assetId: asset.assetId }))
-        })
-        .flat(),
-    // We want to react on accountIds, since the portfolio may not be loaded in the useMemo() above,
-    // and we're iterating, meaning we cannot be reactive on selectAccountIdsByAssetId at hook scope
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [assetId, accountIds, lendingSupportedAssets],
-  )
-
-  const positions = useQueries({
-    queries: accounts.map(({ accountId, assetId: accountAssetId }) => {
-      const assetUserCurrencyRate = selectUserCurrencyRateByAssetId(
-        store.getState(),
-        accountAssetId,
-      )
-      const userCurrencyToUsdRate = selectUserCurrencyToUsdRate(store.getState())
-      const lendingPositionQueryKey: [string, { accountId: AccountId; assetId: AssetId }] = [
-        'thorchainLendingPosition',
-        { accountId, assetId: accountAssetId },
-      ]
-
-      return {
-        staleTime: 120_000,
-        queryKey: lendingPositionQueryKey,
-        queryFn: async () => {
-          const position = await getThorchainLendingPosition({ accountId, assetId: accountAssetId })
-          return position
-        },
-        select: (data: Borrower | null) => {
-          if (!data) return
-
-          const collateralBalanceCryptoPrecision = fromThorBaseUnit(
-            data?.collateral_current,
-          ).toString()
-
-          const collateralBalanceFiatUserCurrency = fromThorBaseUnit(data?.collateral_current)
-            .times(assetUserCurrencyRate)
-            .toString()
-          const debtBalanceFiatUserCurrency = fromThorBaseUnit(data?.debt_current)
-            .times(userCurrencyToUsdRate)
-            .toString()
-
-          return {
-            collateralBalanceCryptoPrecision,
-            collateralBalanceFiatUserCurrency,
-            debtBalanceFiatUserCurrency,
-            address: data?.owner,
-            accountId,
-            assetId: accountAssetId,
-          }
-        },
-      }
-    }),
-  })
-
-  const debtValueUserCurrency = useMemo(
-    () =>
-      positions
-        .reduce((acc, position) => {
-          if (position.data?.debtBalanceFiatUserCurrency) {
-            return acc.plus(position.data.debtBalanceFiatUserCurrency)
-          }
-          return acc
-        }, bn(0))
-        .toString(),
-    [positions],
-  )
-
-  const collateralValueUserCurrency = useMemo(
-    () =>
-      positions
-        .reduce((acc, position) => {
-          if (position.data?.collateralBalanceFiatUserCurrency) {
-            return acc.plus(position.data.collateralBalanceFiatUserCurrency)
-          }
-          return acc
-        }, bn(0))
-        .toString(),
-    [positions],
-  )
-
-  const isLoading = useMemo(() => positions.some(position => position.isLoading), [positions])
-
-  const isActive = useMemo(() => {
-    return positions.some(position => {
-      const data = position.data
-      if (!data) return false
-      const { collateralBalanceCryptoPrecision } = data
-      return collateralBalanceCryptoPrecision && parseFloat(collateralBalanceCryptoPrecision) > 0
-    })
-  }, [positions])
-
-  return {
-    debtValueUserCurrency,
-    collateralValueUserCurrency,
-    positions,
-    isLoading,
-    isActive,
-  }
-}
diff --git a/src/pages/Lending/hooks/useIsLendingActive.ts b/src/pages/Lending/hooks/useIsLendingActive.ts
deleted file mode 100644
index 4d1e1b7fff2..00000000000
--- a/src/pages/Lending/hooks/useIsLendingActive.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { thorchainChainId } from '@shapeshiftoss/caip'
-
-import { useThorchainMimir } from '@/lib/utils/thorchain/hooks/useThorchainMimir'
-
-export const useIsLendingActive = () => {
-  const { data: mimir, isLoading: isMimirLoading } = useThorchainMimir({
-    chainId: thorchainChainId,
-  })
-
-  return {
-    isLendingActive: mimir?.PAUSELOANS === 0,
-    isMimirLoading,
-  }
-}
diff --git a/src/pages/Lending/hooks/useLendingCloseQuery.ts b/src/pages/Lending/hooks/useLendingCloseQuery.ts
deleted file mode 100644
index eb92a88c342..00000000000
--- a/src/pages/Lending/hooks/useLendingCloseQuery.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { bnOrZero } from '@shapeshiftoss/chain-adapters'
-import type { Asset, MarketData } from '@shapeshiftoss/types'
-import type { QueryObserverOptions } from '@tanstack/react-query'
-import { useQuery } from '@tanstack/react-query'
-import memoize from 'lodash/memoize'
-import { useMemo } from 'react'
-
-import { useLendingPositionData } from './useLendingPositionData'
-
-import { useDebounce } from '@/hooks/useDebounce/useDebounce'
-import { BigNumber, bn } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import { BASE_BPS_POINTS } from '@/lib/utils/thorchain/constants'
-import { getMaybeThorchainLendingCloseQuote } from '@/lib/utils/thorchain/lending'
-import type {
-  LendingQuoteClose,
-  LendingWithdrawQuoteResponseSuccess,
-} from '@/lib/utils/thorchain/lending/types'
-import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
-import {
-  selectMarketDataByAssetIdUserCurrency,
-  selectUserCurrencyToUsdRate,
-} from '@/state/slices/marketDataSlice/selectors'
-import { selectPortfolioAccountMetadataByAccountId } from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type UseLendingQuoteCloseQueryProps = {
-  repaymentAssetId: AssetId
-  repaymentAccountId: AccountId | null
-  collateralAccountId: AccountId | null
-  collateralAssetId: AssetId
-  repaymentPercent: number
-  enabled?: boolean
-}
-
-const selectLendingCloseQueryData = memoize(
-  ({
-    data: quote,
-    collateralAssetMarketData,
-    repaymentAssetMarketData,
-    repaymentPercent,
-    repaymentAsset,
-  }: {
-    data: LendingWithdrawQuoteResponseSuccess
-    collateralAssetMarketData: MarketData | undefined
-    repaymentAssetMarketData: MarketData | undefined
-    repaymentPercent: number
-    repaymentAsset: Asset | undefined
-  }): LendingQuoteClose => {
-    if (!repaymentAsset) throw new Error('Repayment asset not found')
-
-    const userCurrencyToUsdRate = selectUserCurrencyToUsdRate(store.getState())
-
-    const quoteLoanCollateralDecreaseCryptoPrecision = fromThorBaseUnit(
-      quote.expected_collateral_withdrawn,
-    ).toString()
-    const quoteLoanCollateralDecreaseFiatUserCurrency = fromThorBaseUnit(
-      quote.expected_collateral_withdrawn,
-    )
-      .times(bnOrZero(collateralAssetMarketData?.price))
-      .toString()
-    const quoteLoanCollateralDecreaseFiatUsd = bn(quoteLoanCollateralDecreaseFiatUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-    const quoteDebtRepaidAmountUserCurrency = fromThorBaseUnit(quote.expected_debt_repaid)
-      .times(userCurrencyToUsdRate)
-      .toString()
-    const quoteDebtRepaidAmountUsd = bn(quoteDebtRepaidAmountUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-    const quoteWithdrawnAmountAfterFeesCryptoPrecision = fromThorBaseUnit(
-      quote.expected_amount_out,
-    ).toString()
-    const quoteWithdrawnAmountAfterFeesThorBaseUnit = bnOrZero(quote.expected_amount_out).toString()
-    const quoteWithdrawnAmountAfterFeesUserCurrency = bnOrZero(
-      quoteWithdrawnAmountAfterFeesCryptoPrecision,
-    )
-      .times(bnOrZero(collateralAssetMarketData?.price))
-      .toString()
-
-    const quoteSlippagePercentageDecimal = bnOrZero(quote.fees.slippage_bps)
-      .div(BASE_BPS_POINTS)
-      .toString()
-    const quoteTotalFeesFiatUserCurrency = fromThorBaseUnit(quote.fees.total)
-      .times(bnOrZero(collateralAssetMarketData?.price))
-      .toString()
-    const quoteTotalFeesFiatUsd = bn(quoteTotalFeesFiatUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-
-    const withdrawnAmountBeforeFeesCryptoPrecision = fromThorBaseUnit(
-      bnOrZero(quote.expected_amount_out).plus(quote.fees.total),
-    )
-    const quoteSlippageWithdrawnAssetCryptoPrecision = withdrawnAmountBeforeFeesCryptoPrecision
-      .times(quoteSlippagePercentageDecimal)
-      .toString()
-
-    const quoteInboundAddress = quote.inbound_address
-    const quoteMemo = quote.memo
-    const quoteExpiry = quote.expiry
-    const quoteOutboundDelayMs = bnOrZero(quote.outbound_delay_seconds).times(1000).toNumber()
-    const quoteInboundConfirmationMs = bnOrZero(quote.inbound_confirmation_seconds)
-      .times(1000)
-      .toNumber()
-    // Sane number for total time, in case the outbound is 0 seconds and the inbound is also fast,
-    // so that users don't end up waiting 30s before the seeminngly "complete" Tx as far as progress bar goes, and actual confirmed state
-    const quoteTotalTimeMs = BigNumber.max(
-      120_000,
-      bn(quoteOutboundDelayMs).plus(quoteInboundConfirmationMs),
-    ).toNumber()
-
-    // Add a 1% buffer to the expected_amount_in to account for the fact that the amount THOR returns to us *should* guarantee
-    // a collateral refund, but sometimes doesn't
-    const safeExpectedAmountIn = bnOrZero(quote.expected_amount_in)
-      .times(repaymentPercent === 100 ? '1.01' : '1')
-      .toFixed()
-
-    const repaymentAmountCryptoPrecision = fromThorBaseUnit(safeExpectedAmountIn).toFixed(
-      repaymentAsset.precision,
-    )
-    const repaymentAmountFiatUserCurrency = fromThorBaseUnit(safeExpectedAmountIn)
-      .times(bnOrZero(repaymentAssetMarketData?.price))
-      .toString()
-    const repaymentAmountFiatUsd = bn(repaymentAmountFiatUserCurrency)
-      .times(userCurrencyToUsdRate)
-      .toFixed()
-
-    return {
-      quoteLoanCollateralDecreaseCryptoPrecision,
-      quoteLoanCollateralDecreaseFiatUserCurrency,
-      quoteLoanCollateralDecreaseFiatUsd,
-      quoteDebtRepaidAmountUserCurrency,
-      quoteDebtRepaidAmountUsd,
-      quoteWithdrawnAmountAfterFeesCryptoPrecision,
-      quoteWithdrawnAmountAfterFeesThorBaseUnit,
-      quoteWithdrawnAmountAfterFeesUserCurrency,
-      quoteSlippageWithdrawnAssetCryptoPrecision,
-      quoteTotalFeesFiatUserCurrency,
-      quoteTotalFeesFiatUsd,
-      quoteInboundAddress,
-      quoteMemo,
-      quoteOutboundDelayMs,
-      quoteInboundConfirmationMs,
-      quoteTotalTimeMs,
-      quoteExpiry,
-      repaymentAmountCryptoPrecision,
-      repaymentAmountFiatUsd,
-      repaymentAmountFiatUserCurrency,
-      repaymentPercent,
-    }
-  },
-)
-
-export const useLendingQuoteCloseQuery = ({
-  repaymentAssetId: _repaymentAssetId,
-  collateralAssetId: _collateralAssetId,
-  repaymentPercent: _repaymentPercent,
-  repaymentAccountId: _repaymentAccountId,
-  collateralAccountId: _collateralAccountId,
-  enabled = true,
-}: UseLendingQuoteCloseQueryProps & Pick<QueryObserverOptions, 'enabled'>) => {
-  const { data: lendingPositionData } = useLendingPositionData({
-    assetId: _collateralAssetId,
-    accountId: _collateralAccountId,
-  })
-
-  const lendingQuoteCloseQueryKey = useDebounce(
-    () => [
-      'lendingQuoteCloseQuery',
-      {
-        collateralAssetAddress: lendingPositionData?.address ?? '',
-        repaymentAssetId: _repaymentAssetId,
-        repaymentAccountId: _repaymentAccountId,
-        collateralAssetId: _collateralAssetId,
-        collateralAccountId: _collateralAccountId,
-        repaymentPercent: _repaymentPercent,
-      },
-    ],
-    500,
-  ) as unknown as [string, UseLendingQuoteCloseQueryProps & { collateralAssetAddress: string }]
-
-  const {
-    repaymentAssetId,
-    repaymentAccountId,
-    collateralAssetId,
-    collateralAccountId,
-    repaymentPercent,
-  } = useMemo(
-    () => ({
-      repaymentAssetId: lendingQuoteCloseQueryKey[1].repaymentAssetId,
-      repaymentAccountId: lendingQuoteCloseQueryKey[1].repaymentAccountId,
-      collateralAssetId: lendingQuoteCloseQueryKey[1].collateralAssetId,
-      collateralAccountId: lendingQuoteCloseQueryKey[1].collateralAccountId,
-      repaymentPercent: lendingQuoteCloseQueryKey[1].repaymentPercent,
-    }),
-    [lendingQuoteCloseQueryKey],
-  )
-
-  const collateralAccountMetadataFilter = useMemo(
-    () => ({ accountId: collateralAccountId ?? '' }),
-    [collateralAccountId],
-  )
-  const collateralAccountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, collateralAccountMetadataFilter),
-  )
-  const repaymentAsset = useAppSelector(state => selectAssetById(state, repaymentAssetId))
-  const repaymentAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, repaymentAssetId),
-  )
-
-  const collateralAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, collateralAssetId),
-  )
-
-  const query = useQuery({
-    // Go stale instantly, and clear garbage collect instantly, as we absolutely want to have the freshest data
-    // because of market-data discrepancies
-    staleTime: 0,
-    gcTime: 0,
-    // Safety first, even if there are already active consumers, remounts should trigger refetches
-    refetchOnMount: true,
-    queryKey: lendingQuoteCloseQueryKey,
-    queryFn: async ({ queryKey }) => {
-      const [, { collateralAssetAddress, repaymentAssetId, collateralAssetId }] = queryKey
-      const quote = await getMaybeThorchainLendingCloseQuote({
-        repaymentAssetId,
-        collateralAssetId,
-        repaymentPercent,
-        collateralAssetAddress, // actually always defined at runtime, see "enabled" option
-      })
-
-      if (quote.isErr()) throw new Error(quote.unwrapErr())
-      return quote.unwrap()
-    },
-    // This avoids retrying errored queries - i.e smaller amounts, or repayment locked will error
-    // Failed queries go stale and don't honor "staleTime", which meaans failed queries would trigger a THOR daemon fetch from all consumers
-    // vs. the failed query being considered fresh
-    retry: false,
-    select: data =>
-      selectLendingCloseQueryData({
-        data,
-        collateralAssetMarketData,
-        repaymentAssetMarketData,
-        repaymentPercent,
-        repaymentAsset,
-      }),
-    // Do not refetch if consumers explicitly set enabled to false
-    refetchIntervalInBackground: Boolean(enabled),
-    refetchInterval: 20_000,
-    enabled: Boolean(
-      enabled &&
-        lendingPositionData?.address &&
-        bnOrZero(repaymentPercent).gt(0) &&
-        repaymentAccountId &&
-        collateralAssetId &&
-        collateralAccountMetadata &&
-        repaymentAsset &&
-        bnOrZero(repaymentPercent).gt(0) &&
-        bnOrZero(repaymentPercent).gt(0),
-    ),
-  })
-
-  return query
-}
diff --git a/src/pages/Lending/hooks/useLendingPositionData.tsx b/src/pages/Lending/hooks/useLendingPositionData.tsx
deleted file mode 100644
index d4b2ce7a3f2..00000000000
--- a/src/pages/Lending/hooks/useLendingPositionData.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import { getThorchainLendingPosition } from '@/lib/utils/thorchain/lending'
-import {
-  selectMarketDataByAssetIdUserCurrency,
-  selectUserCurrencyToUsdRate,
-} from '@/state/slices/marketDataSlice/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type UseLendingPositionDataProps = {
-  accountId: AccountId | null
-  assetId: AssetId
-}
-
-export const thorchainLendingPositionQueryFn = async ({
-  queryKey,
-}: {
-  queryKey: [string, { accountId: AccountId; assetId: AssetId }]
-}) => {
-  const [, { accountId, assetId }] = queryKey
-  const position = await getThorchainLendingPosition({ accountId, assetId })
-  return position
-}
-
-export const useLendingPositionData = ({ accountId, assetId }: UseLendingPositionDataProps) => {
-  const lendingPositionQueryKey: [string, { accountId: AccountId | null; assetId: AssetId }] =
-    useMemo(() => ['thorchainLendingPosition', { accountId, assetId }], [accountId, assetId])
-  const poolAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, assetId),
-  )
-
-  const lendingPositionData = useQuery({
-    // This is on purpose. We want lending position data to be cached forever
-    // The only time we need new data is when doing a lending borrow/repayment
-    // in which case we programatically invalidate queries
-    staleTime: Infinity,
-    queryKey: lendingPositionQueryKey,
-    queryFn: async ({ queryKey }) => {
-      const [, { accountId, assetId }] = queryKey
-      const position = await getThorchainLendingPosition({ accountId, assetId })
-      return position
-    },
-    select: data => {
-      // returns actual derived data, or zero's out fields in case there is no active position
-      const collateralBalanceCryptoPrecision = fromThorBaseUnit(data?.collateral_current).toString()
-
-      const collateralBalanceFiatUserCurrency = fromThorBaseUnit(data?.collateral_current)
-        .times(bnOrZero(poolAssetMarketData?.price))
-        .toString()
-
-      const userCurrencyToUsdRate = selectUserCurrencyToUsdRate(store.getState())
-      const debtBalanceFiatUserCurrency = fromThorBaseUnit(data?.debt_current)
-        .times(bnOrZero(userCurrencyToUsdRate))
-        .toString()
-
-      return {
-        collateralBalanceCryptoPrecision,
-        collateralBalanceFiatUserCurrency,
-        debtBalanceFiatUserCurrency,
-        address: data?.owner,
-      }
-    },
-    enabled: Boolean(accountId && assetId && poolAssetMarketData?.price !== '0'),
-  })
-
-  return lendingPositionData
-}
diff --git a/src/pages/Lending/hooks/useLendingQuoteQuery.ts b/src/pages/Lending/hooks/useLendingQuoteQuery.ts
deleted file mode 100644
index 13f21362673..00000000000
--- a/src/pages/Lending/hooks/useLendingQuoteQuery.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAccountId } from '@shapeshiftoss/caip'
-import { bnOrZero } from '@shapeshiftoss/chain-adapters'
-import { isLedger } from '@shapeshiftoss/hdwallet-ledger'
-import { isTrezor } from '@shapeshiftoss/hdwallet-trezor'
-import { assertAndProcessMemo } from '@shapeshiftoss/swapper'
-import type { MarketData } from '@shapeshiftoss/types'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { useQuery } from '@tanstack/react-query'
-import BigNumber from 'bignumber.js'
-import memoize from 'lodash/memoize'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-
-import { getReceiveAddress } from '@/components/MultiHopTrade/hooks/useReceiveAddress'
-import { useDebounce } from '@/hooks/useDebounce/useDebounce'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { bn } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import { BASE_BPS_POINTS, THORCHAIN_AFFILIATE_NAME } from '@/lib/utils/thorchain/constants'
-import { getMaybeThorchainLendingOpenQuote } from '@/lib/utils/thorchain/lending'
-import type {
-  LendingDepositQuoteResponseSuccess,
-  LendingQuoteOpen,
-} from '@/lib/utils/thorchain/lending/types'
-import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
-import {
-  selectMarketDataByAssetIdUserCurrency,
-  selectUserCurrencyToUsdRate,
-} from '@/state/slices/marketDataSlice/selectors'
-import { selectPortfolioAccountMetadataByAccountId } from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-type UseLendingQuoteQueryProps = {
-  collateralAssetId: AssetId
-  borrowAccountId: AccountId
-  collateralAccountId: AccountId | null
-  borrowAssetId: AssetId
-  depositAmountCryptoPrecision: string
-  enabled?: boolean
-}
-
-type UseLendingQuoteQueryKey = UseLendingQuoteQueryProps & { borrowAssetReceiveAddress: string }
-
-const selectLendingQuoteQuery = memoize(
-  ({
-    data,
-    collateralAssetMarketData,
-    borrowAssetMarketData,
-  }: {
-    data: LendingDepositQuoteResponseSuccess
-    collateralAssetMarketData: MarketData | undefined
-    borrowAssetMarketData: MarketData | undefined
-  }): LendingQuoteOpen => {
-    const quote = data
-    const userCurrencyToUsdRate = selectUserCurrencyToUsdRate(store.getState())
-
-    const quoteCollateralAmountCryptoPrecision = fromThorBaseUnit(
-      quote.expected_collateral_deposited,
-    ).toString()
-    const quoteCollateralAmountFiatUserCurrency = fromThorBaseUnit(
-      quote.expected_collateral_deposited,
-    )
-      .times(bnOrZero(collateralAssetMarketData?.price))
-      .toString()
-
-    const quoteCollateralAmountFiatUsd = bn(quoteCollateralAmountFiatUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-    const quoteDebtAmountUserCurrency = fromThorBaseUnit(quote.expected_debt_issued)
-      .times(userCurrencyToUsdRate)
-      .toString()
-    const quoteDebtAmountUsd = bn(quoteDebtAmountUserCurrency).div(userCurrencyToUsdRate).toString()
-
-    const quoteBorrowedAmountCryptoPrecision = fromThorBaseUnit(
-      quote.expected_amount_out,
-    ).toString()
-    const quoteBorrowedAmountUserCurrency = bnOrZero(quoteBorrowedAmountCryptoPrecision)
-      .times(bnOrZero(borrowAssetMarketData?.price))
-      .toString()
-    const quoteBorrowedAmountUsd = bn(quoteBorrowedAmountUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-
-    const quoteCollateralizationRatioPercent = bnOrZero(quote.expected_collateralization_ratio).div(
-      100,
-    )
-    const quoteCollateralizationRatioPercentDecimal = bnOrZero(quoteCollateralizationRatioPercent)
-      .div(100)
-      .toString()
-    const quoteSlippagePercentageDecimal = bnOrZero(quote.fees.slippage_bps)
-      .div(BASE_BPS_POINTS)
-      .toString()
-    const quoteTotalFeesFiatUserCurrency = fromThorBaseUnit(quote.fees.total)
-      .times(bnOrZero(borrowAssetMarketData?.price))
-      .toString()
-    const quoteTotalFeesFiatUsd = bn(quoteTotalFeesFiatUserCurrency)
-      .div(userCurrencyToUsdRate)
-      .toString()
-    // getting the amount before all fees, so we can determine the slippage denominated in receive asset
-    const borrowAmountBeforeFeesCryptoPrecision = fromThorBaseUnit(
-      bnOrZero(quote.expected_amount_out).plus(quote.fees.total),
-    )
-    const quoteSlippageBorrowedAssetCryptoPrecision = borrowAmountBeforeFeesCryptoPrecision
-      .times(quoteSlippagePercentageDecimal)
-      .toString()
-
-    const quoteSlippageBorrowedAssetUsd = bn(quoteSlippageBorrowedAssetCryptoPrecision)
-      .times(bnOrZero(borrowAssetMarketData?.price))
-      .div(userCurrencyToUsdRate)
-      .toString()
-
-    const quoteInboundAddress = quote.inbound_address
-    // TODO: return quote as is once borrow is using useSendThorTx
-    const quoteMemo = assertAndProcessMemo(quote.memo, THORCHAIN_AFFILIATE_NAME)
-    const quoteExpiry = quote.expiry
-    const quoteOutboundDelayMs = bnOrZero(quote.outbound_delay_seconds).times(1000).toNumber()
-    const quoteInboundConfirmationMs = bnOrZero(quote.inbound_confirmation_seconds)
-      .times(1000)
-      .toNumber()
-    // Sane number for total time, in case the outbound is 0 seconds and the inbound is also fast,
-    // so that users don't end up waiting 30s before the seeminngly "complete" Tx as far as progress bar goes, and actual confirmed state
-    const quoteTotalTimeMs = BigNumber.max(
-      120_000,
-      bn(quoteOutboundDelayMs).plus(quoteInboundConfirmationMs),
-    ).toNumber()
-
-    return {
-      quoteCollateralAmountCryptoPrecision,
-      quoteCollateralAmountFiatUserCurrency,
-      quoteCollateralAmountFiatUsd,
-      quoteDebtAmountUserCurrency,
-      quoteDebtAmountUsd,
-      quoteBorrowedAmountCryptoPrecision,
-      quoteBorrowedAmountUserCurrency,
-      quoteBorrowedAmountUsd,
-      quoteCollateralizationRatioPercentDecimal,
-      quoteSlippageBorrowedAssetCryptoPrecision,
-      quoteSlippageBorrowedAssetUsd,
-      quoteTotalFeesFiatUserCurrency,
-      quoteTotalFeesFiatUsd,
-      quoteInboundAddress,
-      quoteMemo,
-      quoteOutboundDelayMs,
-      quoteInboundConfirmationMs,
-      quoteTotalTimeMs,
-      quoteExpiry,
-    }
-  },
-)
-
-export const useLendingQuoteOpenQuery = ({
-  collateralAssetId: _collateralAssetId,
-  collateralAccountId: _collateralAccountId,
-  borrowAccountId: _borrowAccountId,
-  borrowAssetId: _borrowAssetId,
-  depositAmountCryptoPrecision: _depositAmountCryptoPrecision,
-  enabled = true,
-}: UseLendingQuoteQueryProps) => {
-  const [_borrowAssetReceiveAddress, setBorrowAssetReceiveAddress] = useState<string | null>(null)
-
-  const wallet = useWallet().state.wallet
-
-  const lendingQuoteQueryKey = useDebounce(
-    () => [
-      'lendingQuoteQuery',
-      {
-        borrowAssetReceiveAddress: _borrowAssetReceiveAddress,
-        collateralAccountId: _collateralAccountId,
-        collateralAssetId: _collateralAssetId,
-        borrowAssetId: _borrowAssetId,
-        borrowAccountId: _borrowAccountId,
-        depositAmountCryptoPrecision: _depositAmountCryptoPrecision,
-      },
-    ],
-    500,
-  ) as unknown as [string, UseLendingQuoteQueryKey]
-
-  const {
-    borrowAssetReceiveAddress,
-    collateralAccountId,
-    collateralAssetId,
-    borrowAssetId,
-    depositAmountCryptoPrecision,
-  } = useMemo(
-    () => ({
-      borrowAccountId: lendingQuoteQueryKey[1].borrowAccountId,
-      collateralAccountId: lendingQuoteQueryKey[1].collateralAccountId,
-      collateralAssetId: lendingQuoteQueryKey[1].collateralAssetId,
-      borrowAssetId: lendingQuoteQueryKey[1].borrowAssetId,
-      depositAmountCryptoPrecision: lendingQuoteQueryKey[1].depositAmountCryptoPrecision,
-      borrowAssetReceiveAddress: lendingQuoteQueryKey[1].borrowAssetReceiveAddress,
-    }),
-    [lendingQuoteQueryKey],
-  )
-
-  const destinationAccountMetadataFilter = useMemo(
-    () => ({ accountId: _borrowAccountId }),
-    [_borrowAccountId],
-  )
-  const destinationAccountMetadata = useAppSelector(state =>
-    selectPortfolioAccountMetadataByAccountId(state, destinationAccountMetadataFilter),
-  )
-  const collateralAsset = useAppSelector(state => selectAssetById(state, collateralAssetId))
-  const collateralAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, collateralAssetId),
-  )
-
-  const borrowAsset = useAppSelector(state => selectAssetById(state, _borrowAssetId))
-  const borrowAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, _borrowAssetId),
-  )
-
-  const getBorrowAssetReceiveAddress = useCallback(() => {
-    if (!wallet || !_borrowAccountId || !destinationAccountMetadata || !borrowAsset) return
-
-    const pubKey =
-      isLedger(wallet) || isTrezor(wallet) ? fromAccountId(_borrowAccountId).account : undefined
-
-    return getReceiveAddress({
-      asset: borrowAsset,
-      wallet,
-      accountMetadata: destinationAccountMetadata,
-      pubKey,
-    })
-  }, [borrowAsset, _borrowAccountId, destinationAccountMetadata, wallet])
-
-  useEffect(() => {
-    ;(async () => {
-      const address = await getBorrowAssetReceiveAddress()
-      if (address) setBorrowAssetReceiveAddress(address)
-    })()
-  }, [getBorrowAssetReceiveAddress])
-
-  const query = useQuery({
-    staleTime: 5_000,
-    queryKey: lendingQuoteQueryKey,
-    queryFn: async ({ queryKey }) => {
-      const [
-        ,
-        {
-          borrowAssetReceiveAddress,
-          collateralAssetId,
-          borrowAssetId,
-          depositAmountCryptoPrecision,
-        },
-      ] = queryKey
-      const position = await getMaybeThorchainLendingOpenQuote({
-        receiveAssetId: borrowAssetId,
-        collateralAssetId,
-        collateralAmountCryptoBaseUnit: BigAmount.fromPrecision({
-          value: depositAmountCryptoPrecision,
-          precision: collateralAsset?.precision ?? 0,
-        }).toBaseUnit(),
-        receiveAssetAddress: borrowAssetReceiveAddress ?? '', // actually always defined at runtime, see "enabled" option
-      })
-
-      if (position.isErr()) throw new Error(position.unwrapErr())
-      return position.unwrap()
-    },
-    select: data =>
-      selectLendingQuoteQuery({
-        data,
-        collateralAssetMarketData,
-        borrowAssetMarketData,
-      }),
-    // This avoids retrying errored queries - i.e smaller amounts will error with "failed to simulate swap: fail swap, not enough fee"
-    // Failed queries go stale and don't honor "staleTime", which means smaller amounts would trigger a THOR daemon fetch from all consumers (3 currently)
-    // vs. the failed query being considered fresh
-    retry: false,
-    // Do not refetch if consumers explicitly set enabled to false
-    // They do so because the query should never run in the reactive react realm, but only programmatically with the refetch function
-    refetchIntervalInBackground: enabled,
-    refetchInterval: enabled ? 20_000 : undefined,
-    enabled: Boolean(
-      enabled &&
-        bnOrZero(depositAmountCryptoPrecision).gt(0) &&
-        collateralAccountId &&
-        collateralAccountId &&
-        borrowAssetId &&
-        destinationAccountMetadata &&
-        collateralAsset &&
-        borrowAssetReceiveAddress &&
-        collateralAssetMarketData?.price,
-    ),
-  })
-
-  return query
-}
diff --git a/src/pages/Lending/hooks/useLendingSupportedAssets/index.ts b/src/pages/Lending/hooks/useLendingSupportedAssets/index.ts
deleted file mode 100644
index 64bcf30036f..00000000000
--- a/src/pages/Lending/hooks/useLendingSupportedAssets/index.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { fromAssetId, thorchainAssetId, thorchainChainId } from '@shapeshiftoss/caip'
-import { supportsThorchain } from '@shapeshiftoss/hdwallet-core/wallet'
-import type { ThornodePoolResponse, ThornodePoolStatuses } from '@shapeshiftoss/swapper'
-import { thorPoolAssetIdToAssetId } from '@shapeshiftoss/swapper'
-import type { KnownChainIds } from '@shapeshiftoss/types'
-import { useQuery } from '@tanstack/react-query'
-import { useCallback, useMemo } from 'react'
-import { useSelector } from 'react-redux'
-
-import { knownChainIds } from '@/constants/chains'
-import { useIsSnapInstalled } from '@/hooks/useIsSnapInstalled/useIsSnapInstalled'
-import { useWallet } from '@/hooks/useWallet/useWallet'
-import { walletSupportsChain } from '@/hooks/useWalletSupportsChain/useWalletSupportsChain'
-import { isSome } from '@/lib/utils'
-import { useThorchainMimir } from '@/lib/utils/thorchain/hooks/useThorchainMimir'
-import { reactQueries } from '@/react-queries'
-import {
-  selectAccountIdsByChainId,
-  selectAssetById,
-  selectWalletConnectedChainIds,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-const queryKey = ['lendingSupportedAssets']
-
-const lendingThorRegex = /^LENDING-THOR-(\w+)$/
-
-export const useLendingSupportedAssets = ({
-  type,
-  statusFilter = 'Available',
-}: {
-  type: 'collateral' | 'borrow'
-  statusFilter?: ThornodePoolStatuses | 'All'
-}) => {
-  const {
-    state: { wallet, isConnected },
-  } = useWallet()
-  const { isSnapInstalled } = useIsSnapInstalled()
-
-  const { data: availablePools } = useQuery({
-    ...reactQueries.thornode.poolsData(),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    // Infinity staleTime as we handle halted state JIT
-    staleTime: Infinity,
-    select:
-      statusFilter !== 'All'
-        ? pools => pools.filter(pool => statusFilter.includes(pool.status))
-        : undefined,
-  })
-
-  const { data: mimir } = useThorchainMimir({ chainId: thorchainChainId })
-
-  const accountIdsByChainId = useAppSelector(selectAccountIdsByChainId)
-  const walletSupportChains = useMemo(
-    () =>
-      knownChainIds.filter(chainId => {
-        const chainAccountIds = accountIdsByChainId[chainId] ?? []
-        return walletSupportsChain({
-          chainId,
-          wallet,
-          isSnapInstalled,
-          checkConnectedAccountIds: chainAccountIds,
-        })
-      }),
-    [accountIdsByChainId, isSnapInstalled, wallet],
-  )
-
-  const walletChainIds = useSelector(selectWalletConnectedChainIds)
-
-  const selectSupportedAssets = useCallback(
-    (data: ThornodePoolResponse[] | undefined) => {
-      if (!data) return []
-      if (!mimir) return []
-
-      const pools = (availablePools ?? []).filter(pool => {
-        if (type === 'borrow') return true
-        if (type === 'collateral') {
-          const mimirLendingEnabledPools = Object.keys(mimir)
-            .filter(key => lendingThorRegex.test(key))
-            .map(key => {
-              const match = key.match(lendingThorRegex)?.[1]
-              if (!match) return undefined
-
-              // i.e LENDING-THOR-BTC, LENDING-THOR-ETH
-              // No token pools support, so that works, and lending's pretty much going hasta la vista
-              // so we don't need to worry about this not generalizing to assets
-              return `${match}.${match}`
-            })
-            .filter(Boolean)
-
-          return mimirLendingEnabledPools.includes(pool.asset)
-        }
-        return false
-      })
-
-      const supportedAssets = pools
-        .map(pool => {
-          const assetId = thorPoolAssetIdToAssetId(pool.asset)
-          const chainId = assetId ? (fromAssetId(assetId).chainId as KnownChainIds) : undefined
-
-          // Wallet feature-capability checks below do not apply if no wallet is connected
-          if (isConnected) {
-            if (!chainId || !walletSupportChains.includes(chainId)) return undefined
-            // Chain supported by the wallet, but no actual account for it.
-            // This can happen with Ledger, when the chain's accounts haven't been connected
-            if (type === 'borrow' && !walletChainIds.includes(chainId)) {
-              return undefined
-            }
-          }
-
-          const asset = selectAssetById(store.getState(), assetId ?? '')
-          return asset
-        })
-        .filter(isSome)
-
-      if (
-        type === 'borrow' &&
-        (!isConnected ||
-          (wallet && supportsThorchain(wallet) && walletChainIds.includes(thorchainChainId)))
-      ) {
-        const runeAsset = selectAssetById(store.getState(), thorchainAssetId)
-        if (!runeAsset) return
-        supportedAssets.push(runeAsset)
-      }
-      return supportedAssets
-    },
-    [availablePools, isConnected, mimir, type, wallet, walletChainIds, walletSupportChains],
-  )
-
-  const lendingSupportedAssetsQuery = useQuery({
-    staleTime: 60_000,
-    queryKey,
-    queryFn: () => availablePools,
-    select: selectSupportedAssets,
-    enabled: Boolean(availablePools?.length),
-  })
-
-  return lendingSupportedAssetsQuery
-}
diff --git a/src/pages/Lending/hooks/usePoolDataQuery.ts b/src/pages/Lending/hooks/usePoolDataQuery.ts
deleted file mode 100644
index 0a81b8db067..00000000000
--- a/src/pages/Lending/hooks/usePoolDataQuery.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import type { AssetId } from '@shapeshiftoss/caip'
-import { thorchainChainId } from '@shapeshiftoss/caip'
-import { SwapperName } from '@shapeshiftoss/swapper'
-import { useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import { useThorchainMimir } from '@/lib/utils/thorchain/hooks/useThorchainMimir'
-import {
-  getAllThorchainLendingPositions,
-  getThorchainPoolInfo,
-} from '@/lib/utils/thorchain/lending'
-import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
-import {
-  selectAssetById,
-  selectMarketDataByAssetIdUserCurrency,
-  selectUserCurrencyToUsdRate,
-} from '@/state/slices/selectors'
-import { store, useAppSelector } from '@/state/store'
-
-export const usePoolDataQuery = ({ poolAssetId }: { poolAssetId: string }) => {
-  const poolDataQueryKey: [string, { assetId: AssetId }] = useMemo(
-    () => ['thorchainLendingPoolData', { assetId: poolAssetId }],
-    [poolAssetId],
-  )
-
-  const poolAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, poolAssetId),
-  )
-
-  const { isTradingActive } = useIsTradingActive({
-    assetId: poolAssetId,
-    swapperName: SwapperName.Thorchain,
-  })
-
-  const poolAsset = useAppSelector(state => selectAssetById(state, poolAssetId))
-
-  const { data: mimir } = useThorchainMimir({ chainId: thorchainChainId })
-
-  const isAssetLendingEnabled = useMemo(() => {
-    if (!mimir || !poolAsset) return false
-    const mimirKey = `LENDING-THOR-${poolAsset.symbol.toUpperCase()}`
-    return mimir[mimirKey] === 1
-  }, [mimir, poolAsset])
-
-  const poolDataQuery = useQuery({
-    // TODO(gomes): we may or may not want to change this, but this avoids spamming the API for the time being.
-    // by default, there's a 5mn cache time, but a 0 stale time, meaning queries are considered stale immediately
-    // Since react-query queries aren't persisted, and until we have an actual need for ensuring the data is fresh,
-    // this is a good way to avoid spamming the API during develpment
-    staleTime: Infinity,
-    queryKey: poolDataQueryKey,
-    queryFn: async ({ queryKey }) => {
-      const [, { assetId }] = queryKey
-      const positions = await getAllThorchainLendingPositions(assetId)
-      const poolInfo = await getThorchainPoolInfo(assetId)
-      return { positions, poolInfo }
-    },
-    select: data => {
-      const { positions, poolInfo } = data
-      // returns actual derived data, or zero's out fields in case there is no active position
-      const totalBorrowers = positions?.length ?? 0
-
-      const { totalCollateral, totalDebt } = positions.reduce(
-        (acc, position) => {
-          acc.totalCollateral = acc.totalCollateral.plus(position.collateral_current)
-          acc.totalDebt = acc.totalDebt.plus(position.debt_current)
-
-          return acc
-        },
-        {
-          totalCollateral: bn(0),
-          totalDebt: bn(0),
-        },
-      )
-
-      const totalCollateralCryptoPrecision = fromThorBaseUnit(totalCollateral).toString()
-      const totalDebtUSD = fromThorBaseUnit(totalDebt).toString()
-      const userCurrencyToUsdRate = selectUserCurrencyToUsdRate(store.getState())
-      const totalDebtUserCurrency = bnOrZero(totalDebtUSD).times(userCurrencyToUsdRate).toString()
-
-      const collateralizationRatioPercent = bnOrZero(poolInfo.loan_cr).div(100)
-      const collateralizationRatioPercentDecimal = bnOrZero(collateralizationRatioPercent)
-        .div(100)
-        .toString()
-
-      const tvlCryptoPrecision = fromThorBaseUnit(poolInfo.loan_collateral)
-      const maxSupplyCryptoPrecision = fromThorBaseUnit(poolInfo.loan_collateral).plus(
-        fromThorBaseUnit(poolInfo.loan_collateral_remaining),
-      )
-
-      const tvl = tvlCryptoPrecision.times(bnOrZero(poolAssetMarketData?.price)).toFixed()
-      const maxSupplyFiat = maxSupplyCryptoPrecision
-        .times(bnOrZero(poolAssetMarketData?.price))
-        .toFixed()
-
-      return {
-        totalBorrowers,
-        totalCollateralCryptoPrecision,
-        totalDebtUserCurrency,
-        collateralizationRatioPercentDecimal,
-        tvl,
-        maxSupplyFiat,
-        isTradingActive,
-        isAssetLendingEnabled,
-        isHardCapReached: bnOrZero(tvl).eq(maxSupplyFiat),
-        currentCapFillPercentage: bnOrZero(tvl).div(bnOrZero(maxSupplyFiat)).times(100).toNumber(),
-      }
-    },
-    enabled: true,
-  })
-
-  return poolDataQuery
-}
diff --git a/src/pages/Lending/hooks/useRepaymentLockData.tsx b/src/pages/Lending/hooks/useRepaymentLockData.tsx
deleted file mode 100644
index bfc2117aea2..00000000000
--- a/src/pages/Lending/hooks/useRepaymentLockData.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { thorchainChainId } from '@shapeshiftoss/caip'
-import { useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-
-import { thorchainLendingPositionQueryFn } from './useLendingPositionData'
-
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { THORCHAIN_BLOCK_TIME_SECONDS, thorchainBlockTimeMs } from '@/lib/utils/thorchain/constants'
-import { useThorchainMimir } from '@/lib/utils/thorchain/hooks/useThorchainMimir'
-import { reactQueries } from '@/react-queries'
-
-type UseLendingPositionDataProps = {
-  accountId?: AccountId | null
-  assetId?: AssetId
-  enabled?: boolean
-}
-
-export const useRepaymentLockData = ({
-  accountId,
-  assetId,
-  // Let the parent pass its own query options
-  // enabled will be used in conjunction with this hook's own isRepaymentLockQueryEnabled to determine whether or not to run the query
-  enabled = true,
-}: UseLendingPositionDataProps) => {
-  const { data: blockHeight } = useQuery({
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    // We use the block query to get the current height, so we obviously need to mark it stale at the end of each THOR block
-    staleTime: thorchainBlockTimeMs,
-    ...reactQueries.thornode.block(),
-    select: block => block.header.height,
-    enabled,
-  })
-
-  const lendingPositionQueryKey = useMemo(
-    () => ['thorchainLendingPosition', { accountId, assetId }],
-    [accountId, assetId],
-  )
-
-  const { data: position, isSuccess: isPositionQuerySuccess } = useQuery({
-    // TODO(gomes): we may or may not want to change this, but this avoids spamming the API for the time being.
-    // by default, there's a 5mn cache time, but a 0 stale time, meaning queries are considered stale immediately
-    // Since react-query queries aren't persisted, and until we have an actual need for ensuring the data is fresh,
-    // this is a good way to avoid spamming the API during develpment
-    staleTime: Infinity,
-    queryFn: thorchainLendingPositionQueryFn,
-    // accountId and assetId are actually enabled at runtime - see enabled below
-    queryKey: lendingPositionQueryKey as [string, { accountId: AccountId; assetId: AssetId }],
-    enabled: enabled && !!accountId && !!assetId,
-  })
-
-  const repaymentLockData = useThorchainMimir({
-    chainId: thorchainChainId,
-    select: mimirData => {
-      if (!mimirData || !blockHeight) return null
-
-      const repaymentMaturity = mimirData.LOANREPAYMENTMATURITY
-
-      // If position is not available, return the repayment maturity as specified by the network, currently about 30 days
-      if (!position) {
-        return bnOrZero(repaymentMaturity)
-          .times(THORCHAIN_BLOCK_TIME_SECONDS)
-          .div(60 * 60 * 24)
-          .toString()
-      }
-
-      // We have a user position, so we can calculate the actual repayment lock
-      const repaymentBlock = bnOrZero(position.last_open_height).plus(repaymentMaturity)
-      return bnOrZero(repaymentBlock)
-        .minus(blockHeight)
-        .times(THORCHAIN_BLOCK_TIME_SECONDS)
-        .div(60 * 60 * 24)
-        .toFixed(1)
-    },
-    enabled: isPositionQuerySuccess,
-  })
-
-  return repaymentLockData
-}
diff --git a/src/pages/TCY/components/Claim/ClaimConfirm.tsx b/src/pages/TCY/components/Claim/ClaimConfirm.tsx
index 396c74297c0..c5631e36ee3 100644
--- a/src/pages/TCY/components/Claim/ClaimConfirm.tsx
+++ b/src/pages/TCY/components/Claim/ClaimConfirm.tsx
@@ -27,6 +27,7 @@ import { HelperTooltip } from '@/components/HelperTooltip/HelperTooltip'
 import { InlineCopyButton } from '@/components/InlineCopyButton'
 import { ReusableConfirm } from '@/components/ReusableConfirm/ReusableConfirm'
 import { RawText, Text } from '@/components/Text'
+import { useIsSweepNeededQuery } from '@/hooks/queries/useIsSweepNeededQuery'
 import { useWallet } from '@/hooks/useWallet/useWallet'
 import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
 import { THOR_PRECISION } from '@/lib/utils/thorchain/constants'
@@ -34,7 +35,6 @@ import { useIsChainHalted } from '@/lib/utils/thorchain/hooks/useIsChainHalted'
 import { useSendThorTx } from '@/lib/utils/thorchain/hooks/useSendThorTx'
 import { useThorchainMimir } from '@/lib/utils/thorchain/hooks/useThorchainMimir'
 import { isUtxoChainId } from '@/lib/utils/utxo'
-import { useIsSweepNeededQuery } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
 import { useIsTradingActive } from '@/react-queries/hooks/useIsTradingActive'
 import { actionSlice } from '@/state/slices/actionSlice/actionSlice'
 import { ActionStatus, ActionType } from '@/state/slices/actionSlice/types'
diff --git a/src/pages/TCY/queries/useTcyClaims.tsx b/src/pages/TCY/queries/useTcyClaims.tsx
index 971f900b983..d1f1c0cbd42 100644
--- a/src/pages/TCY/queries/useTcyClaims.tsx
+++ b/src/pages/TCY/queries/useTcyClaims.tsx
@@ -15,7 +15,7 @@ import { useIsSnapInstalled } from '@/hooks/useIsSnapInstalled/useIsSnapInstalle
 import { useWallet } from '@/hooks/useWallet/useWallet'
 import { isSome } from '@/lib/utils'
 import { getThorfiUtxoFromAddresses } from '@/lib/utils/thorchain'
-import { isSupportedThorchainSaversAssetId } from '@/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils'
+import { isSupportedThorchainSaversAssetId } from '@/lib/utils/thorchain/savers'
 import {
   selectAccountIdsByAccountNumberAndChainId,
   selectAccountNumberByAccountId,
diff --git a/src/pages/ThorChainLP/AvailablePools.tsx b/src/pages/ThorChainLP/AvailablePools.tsx
index 9672fa749e3..2a413a089d6 100644
--- a/src/pages/ThorChainLP/AvailablePools.tsx
+++ b/src/pages/ThorChainLP/AvailablePools.tsx
@@ -1,4 +1,4 @@
-import type { FlexProps, GridProps } from '@chakra-ui/react'
+import type { FlexProps } from '@chakra-ui/react'
 import {
   Alert,
   AlertDescription,
@@ -31,11 +31,6 @@ import { RawText, Text } from '@/components/Text'
 import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
 import { bnOrZero } from '@/lib/bignumber/bignumber'
 
-export const lendingRowGrid: GridProps['gridTemplateColumns'] = {
-  base: 'minmax(150px, 1fr) repeat(1, minmax(40px, max-content))',
-  lg: '1fr repeat(2, 1fr)',
-  xl: '1fr repeat(3, minmax(200px, max-content))',
-}
 const mobileDisplay = {
   base: 'none',
   lg: 'flex',
diff --git a/src/pages/ThorChainLP/Pool/Pool.tsx b/src/pages/ThorChainLP/Pool/Pool.tsx
index 5cfa93d8bf3..97382a28eee 100644
--- a/src/pages/ThorChainLP/Pool/Pool.tsx
+++ b/src/pages/ThorChainLP/Pool/Pool.tsx
@@ -196,7 +196,7 @@ export const Pool = () => {
             <PairRates assetIds={poolAssetIds} />
             <Flex gap={4}>
               <Tooltip
-                label={translate('defi.modals.saversVaults.haltedDepositTitle')}
+                label={translate('pools.haltedDepositTitle')}
                 isDisabled={isTradingActive === undefined || isTradingActive === true}
                 hasArrow
               >
diff --git a/src/pages/ThorChainLP/YourPositions.tsx b/src/pages/ThorChainLP/YourPositions.tsx
index e88dfb18bf2..32b66112372 100644
--- a/src/pages/ThorChainLP/YourPositions.tsx
+++ b/src/pages/ThorChainLP/YourPositions.tsx
@@ -1,4 +1,4 @@
-import type { FlexProps, GridProps } from '@chakra-ui/react'
+import type { FlexProps } from '@chakra-ui/react'
 import { Box, Flex, Skeleton, Spinner, Stack, Tag } from '@chakra-ui/react'
 import { thorchainAssetId } from '@shapeshiftoss/caip'
 import { useQuery } from '@tanstack/react-query'
@@ -32,11 +32,6 @@ import { reactQueries } from '@/react-queries'
 import { selectAssetById, selectMarketDataByAssetIdUserCurrency } from '@/state/slices/selectors'
 import { useAppSelector } from '@/state/store'
 
-export const lendingRowGrid: GridProps['gridTemplateColumns'] = {
-  base: 'minmax(150px, 1fr) repeat(1, minmax(40px, max-content))',
-  lg: '1fr repeat(2, minmax(200px, max-content))',
-  xl: '1fr repeat(3, minmax(200px, max-content))',
-}
 const mobileDisplay = {
   base: 'none',
   lg: 'flex',
diff --git a/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx b/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
index 40f9a6635a4..1e056a7d2d5 100644
--- a/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
+++ b/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
@@ -61,6 +61,7 @@ import { SlideTransition } from '@/components/SlideTransition'
 import { RawText, Text } from '@/components/Text'
 import type { TextPropTypes } from '@/components/Text/Text'
 import { useAllowanceApprovalRequirements } from '@/hooks/queries/useAllowanceApprovalRequirements'
+import { useIsSweepNeededQuery } from '@/hooks/queries/useIsSweepNeededQuery'
 import { useBrowserRouter } from '@/hooks/useBrowserRouter/useBrowserRouter'
 import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
 import { useIsSmartContractAddress } from '@/hooks/useIsSmartContractAddress/useIsSmartContractAddress'
@@ -89,7 +90,6 @@ import { estimateAddThorchainLiquidityPosition } from '@/lib/utils/thorchain/lp'
 import type { LpConfirmedDepositQuote } from '@/lib/utils/thorchain/lp/types'
 import { AsymSide } from '@/lib/utils/thorchain/lp/types'
 import { formatSecondsToDuration } from '@/lib/utils/time'
-import { useIsSweepNeededQuery } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
 import { usePools } from '@/pages/ThorChainLP/queries/hooks/usePools'
 import { useUserLpData } from '@/pages/ThorChainLP/queries/hooks/useUserLpData'
 import { getThorchainLpPosition } from '@/pages/ThorChainLP/queries/queries'
diff --git a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx
index c5692a8b4c6..a59f003155d 100644
--- a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx
+++ b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx
@@ -42,6 +42,7 @@ import { SlippagePopover } from '@/components/MultiHopTrade/components/SlippageP
 import { TradeAssetInput } from '@/components/MultiHopTrade/components/TradeAssetInput'
 import { Row } from '@/components/Row/Row'
 import { SlideTransition } from '@/components/SlideTransition'
+import { useIsSweepNeededQuery } from '@/hooks/queries/useIsSweepNeededQuery'
 import { useFeatureFlag } from '@/hooks/useFeatureFlag/useFeatureFlag'
 import { useIsSnapInstalled } from '@/hooks/useIsSnapInstalled/useIsSnapInstalled'
 import { useWallet } from '@/hooks/useWallet/useWallet'
@@ -59,7 +60,6 @@ import { estimateRemoveThorchainLiquidityPosition } from '@/lib/utils/thorchain/
 import type { LpConfirmedWithdrawalQuote, UserLpDataPosition } from '@/lib/utils/thorchain/lp/types'
 import { AsymSide } from '@/lib/utils/thorchain/lp/types'
 import { formatSecondsToDuration } from '@/lib/utils/time'
-import { useIsSweepNeededQuery } from '@/pages/Lending/hooks/useIsSweepNeededQuery'
 import { usePool } from '@/pages/ThorChainLP/queries/hooks/usePool'
 import { useUserLpData } from '@/pages/ThorChainLP/queries/hooks/useUserLpData'
 import { getThorchainLpPosition } from '@/pages/ThorChainLP/queries/queries'
diff --git a/src/react-queries/hooks/useQuoteEstimatedFeesQuery.ts b/src/react-queries/hooks/useQuoteEstimatedFeesQuery.ts
deleted file mode 100644
index ddbe8632629..00000000000
--- a/src/react-queries/hooks/useQuoteEstimatedFeesQuery.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import type { AccountId, AssetId } from '@shapeshiftoss/caip'
-import { fromAssetId } from '@shapeshiftoss/caip'
-import type { Asset, KnownChainIds } from '@shapeshiftoss/types'
-import { BigAmount } from '@shapeshiftoss/utils'
-import { skipToken, useQuery } from '@tanstack/react-query'
-import { useMemo } from 'react'
-import { toHex } from 'viem'
-
-import type { EstimateFeesInput } from '@/components/Modals/Send/utils'
-import { estimateFees } from '@/components/Modals/Send/utils'
-import { bnOrZero } from '@/lib/bignumber/bignumber'
-import { getSupportedEvmChainIds } from '@/lib/utils/evm'
-import type { LendingQuoteClose, LendingQuoteOpen } from '@/lib/utils/thorchain/lending/types'
-import type {
-  LpConfirmedDepositQuote,
-  LpConfirmedWithdrawalQuote,
-} from '@/lib/utils/thorchain/lp/types'
-import { selectFeeAssetById, selectMarketDataByAssetIdUserCurrency } from '@/state/slices/selectors'
-import { useAppSelector } from '@/state/store'
-
-type UseQuoteEstimatedFeesProps = {
-  enabled?: boolean
-  collateralAssetId: AssetId
-} & (
-  | {
-      confirmedQuote: LendingQuoteOpen | null
-      collateralAccountId: AccountId
-      depositAmountCryptoPrecision: string
-      repaymentAccountId?: never
-      repaymentAsset?: never
-      repaymentAmountCryptoPrecision?: never
-    }
-  | {
-      confirmedQuote: LendingQuoteClose | null
-      collateralAccountId: AccountId
-      depositAmountCryptoPrecision?: never
-      repaymentAccountId: AccountId
-      repaymentAsset: Asset | null
-      repaymentAmountCryptoPrecision?: never
-    }
-  | {
-      confirmedQuote: LpConfirmedDepositQuote | null
-      // Technically not a collateral, but this avoids weird branching, ternaries or ?? checks for now
-      collateralAccountId: AccountId
-      depositAmountCryptoPrecision: string
-      repaymentAccountId?: never
-      repaymentAsset?: never
-      repaymentAmountCryptoPrecision?: never
-    }
-  | {
-      confirmedQuote: LpConfirmedWithdrawalQuote | null
-      // Technically not a collateral, but this avoids weird branching, ternaries or ?? checks for now
-      collateralAccountId: AccountId
-      depositAmountCryptoPrecision?: never
-      repaymentAccountId: AccountId
-      repaymentAsset: Asset | null
-      repaymentAmountCryptoPrecision: string | undefined
-    }
-)
-
-export const useQuoteEstimatedFeesQuery = ({
-  collateralAssetId,
-  collateralAccountId,
-  depositAmountCryptoPrecision,
-  repaymentAccountId,
-  repaymentAsset,
-  confirmedQuote,
-  repaymentAmountCryptoPrecision: _repaymentAmountCryptoPrecision,
-  enabled: _enabled = true,
-}: UseQuoteEstimatedFeesProps) => {
-  const repaymentAmountCryptoPrecision = useMemo(
-    () =>
-      _repaymentAmountCryptoPrecision ??
-      (confirmedQuote as LendingQuoteClose)?.repaymentAmountCryptoPrecision,
-    [_repaymentAmountCryptoPrecision, confirmedQuote],
-  )
-  const feeAsset = useAppSelector(state => selectFeeAssetById(state, collateralAssetId))
-  const feeAssetMarketData = useAppSelector(state =>
-    selectMarketDataByAssetIdUserCurrency(state, collateralAssetId),
-  )
-  const estimateFeesArgs = useMemo((): EstimateFeesInput => {
-    const supportedEvmChainIds = getSupportedEvmChainIds()
-    const amountCryptoPrecision =
-      depositAmountCryptoPrecision ?? repaymentAmountCryptoPrecision ?? '0'
-    const assetId = repaymentAsset?.assetId ?? collateralAssetId
-    const quoteMemo =
-      confirmedQuote && 'quoteMemo' in confirmedQuote ? confirmedQuote.quoteMemo : ''
-    const memo =
-      assetId && supportedEvmChainIds.includes(fromAssetId(assetId).chainId as KnownChainIds)
-        ? toHex(quoteMemo)
-        : quoteMemo
-    const to =
-      confirmedQuote && 'quoteInboundAddress' in confirmedQuote
-        ? confirmedQuote.quoteInboundAddress
-        : ''
-    const accountId = repaymentAccountId ?? collateralAccountId
-
-    return {
-      amountCryptoPrecision,
-      assetId,
-      memo,
-      to,
-      accountId,
-      sendMax: false,
-      contractAddress: undefined,
-    }
-  }, [
-    depositAmountCryptoPrecision,
-    repaymentAmountCryptoPrecision,
-    repaymentAsset?.assetId,
-    collateralAssetId,
-    confirmedQuote,
-    repaymentAccountId,
-    collateralAccountId,
-  ])
-
-  const quoteEstimatedFeesQueryKey = useMemo(
-    () => ['thorchainLendingQuoteEstimatedFees', estimateFeesArgs],
-    [estimateFeesArgs],
-  )
-
-  const enabled = useMemo(
-    () =>
-      Boolean(
-        _enabled &&
-          feeAsset &&
-          confirmedQuote &&
-          (collateralAssetId || repaymentAsset) &&
-          (bnOrZero(depositAmountCryptoPrecision).gt(0) || !!repaymentAmountCryptoPrecision),
-      ),
-    [
-      _enabled,
-      collateralAssetId,
-      confirmedQuote,
-      depositAmountCryptoPrecision,
-      feeAsset,
-      repaymentAmountCryptoPrecision,
-      repaymentAsset,
-    ],
-  )
-
-  const useQuoteEstimatedFeesQuery = useQuery({
-    queryKey: quoteEstimatedFeesQueryKey,
-    queryFn:
-      enabled && feeAsset
-        ? async () => {
-            const estimatedFees = await estimateFees(estimateFeesArgs)
-            const txFeeCrypto = BigAmount.fromBaseUnit({
-              value: estimatedFees.fast.txFee ?? '0',
-              precision: feeAsset.precision,
-            })
-            const txFeeFiat = bnOrZero(txFeeCrypto.toPrecision())
-              .times(bnOrZero(feeAssetMarketData?.price))
-              .toString()
-            return { estimatedFees, txFeeFiat, txFeeCryptoBaseUnit: estimatedFees.fast.txFee }
-          }
-        : skipToken,
-    retry: false,
-  })
-
-  return useQuoteEstimatedFeesQuery
-}
diff --git a/src/state/migrations/index.ts b/src/state/migrations/index.ts
index ca7800d3ba2..b0259a28090 100644
--- a/src/state/migrations/index.ts
+++ b/src/state/migrations/index.ts
@@ -29,6 +29,7 @@ export const clearOpportunitiesMigrations = {
   4: clearOpportunities,
   5: clearOpportunities,
   6: clearOpportunities,
+  7: clearOpportunities,
 } as unknown as Omit<MigrationManifest, '_persist'>
 
 export const clearPortfolioMigrations = {
diff --git a/src/state/slices/opportunitiesSlice/constants.ts b/src/state/slices/opportunitiesSlice/constants.ts
index 4572119ee82..81c3be83c18 100644
--- a/src/state/slices/opportunitiesSlice/constants.ts
+++ b/src/state/slices/opportunitiesSlice/constants.ts
@@ -103,8 +103,8 @@ export const DEFI_PROVIDER_TO_METADATA: Record<DefiProvider, DefiProviderMetadat
     color: '#C5B5F2',
     url: 'https://app.shapeshift.com',
   },
-  [DefiProvider.ThorchainSavers]: {
-    provider: DefiProvider.ThorchainSavers,
+  [DefiProvider.RunePool]: {
+    provider: DefiProvider.RunePool,
     icon: 'https://rawcdn.githack.com/trustwallet/assets/32e51d582a890b3dd3135fe3ee7c20c2fd699a6d/blockchains/thorchain/info/logo.png',
     color: '#0CDBE0',
     url: 'https://x.com/thorchain',
diff --git a/src/state/slices/opportunitiesSlice/mappings.ts b/src/state/slices/opportunitiesSlice/mappings.ts
index 198cd76b6d1..7b8fe05c82c 100644
--- a/src/state/slices/opportunitiesSlice/mappings.ts
+++ b/src/state/slices/opportunitiesSlice/mappings.ts
@@ -17,10 +17,10 @@ import {
   rFOXStakingUserDataResolver,
 } from './resolvers/rFOX'
 import {
-  thorchainSaversOpportunityIdsResolver,
-  thorchainSaversStakingOpportunitiesMetadataResolver,
-  thorchainSaversStakingOpportunitiesUserDataResolver,
-} from './resolvers/thorchainsavers'
+  runePoolOpportunityIdsResolver,
+  runePoolStakingOpportunitiesMetadataResolver,
+  runePoolStakingOpportunitiesUserDataResolver,
+} from './resolvers/runepool'
 import type {
   DefiProviderToMetadataResolver,
   DefiProviderToOpportunitiesMetadataResolver,
@@ -44,15 +44,15 @@ export const DefiProviderToOpportunitiesMetadataResolverByDeFiType: DefiProvider
     [`${DefiProvider.CosmosSdk}`]: {
       [`${DefiType.Staking}`]: cosmosSdkStakingOpportunitiesMetadataResolver,
     },
-    [`${DefiProvider.ThorchainSavers}`]: {
-      [`${DefiType.Staking}`]: thorchainSaversStakingOpportunitiesMetadataResolver,
+    [`${DefiProvider.RunePool}`]: {
+      [`${DefiType.Staking}`]: runePoolStakingOpportunitiesMetadataResolver,
     },
   }
 
 export const DefiProviderToOpportunitiesUserDataResolverByDeFiType: DefiProviderToOpportunitiesUserDataResolver =
   {
-    [`${DefiProvider.ThorchainSavers}`]: {
-      [`${DefiType.Staking}`]: thorchainSaversStakingOpportunitiesUserDataResolver,
+    [`${DefiProvider.RunePool}`]: {
+      [`${DefiType.Staking}`]: runePoolStakingOpportunitiesUserDataResolver,
     },
     [`${DefiProvider.CosmosSdk}`]: {
       [`${DefiType.Staking}`]: cosmosSdkStakingOpportunitiesUserDataResolver,
@@ -67,8 +67,8 @@ export const DefiProviderToOpportunityIdsResolverByDeFiType: DefiProviderToOppor
     [`${DefiProvider.rFOX}`]: {
       [`${DefiType.Staking}`]: rFOXStakingOpportunityIdsResolver,
     },
-    [`${DefiProvider.ThorchainSavers}`]: {
-      [`${DefiType.Staking}`]: thorchainSaversOpportunityIdsResolver,
+    [`${DefiProvider.RunePool}`]: {
+      [`${DefiType.Staking}`]: runePoolOpportunityIdsResolver,
     },
     [`${DefiProvider.CosmosSdk}`]: {
       [`${DefiType.Staking}`]: cosmosSdkOpportunityIdsResolver,
@@ -91,69 +91,31 @@ export const CHAIN_ID_TO_SUPPORTED_DEFI_OPPORTUNITIES: Record<
     defiType: DefiType
   }[]
 > = {
-  [KnownChainIds.AvalancheMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
-  [KnownChainIds.LitecoinMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
-  [KnownChainIds.BitcoinCashMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
-  [KnownChainIds.DogecoinMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
-  [KnownChainIds.BitcoinMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
+  [KnownChainIds.AvalancheMainnet]: [],
+  [KnownChainIds.LitecoinMainnet]: [],
+  [KnownChainIds.BitcoinCashMainnet]: [],
+  [KnownChainIds.DogecoinMainnet]: [],
+  [KnownChainIds.BitcoinMainnet]: [],
   [KnownChainIds.EthereumMainnet]: [
     {
       defiProvider: DefiProvider.EthFoxStaking,
       defiType: DefiType.Staking,
     },
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
-  ],
-  [KnownChainIds.BnbSmartChainMainnet]: [
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
   ],
+  [KnownChainIds.BnbSmartChainMainnet]: [],
 
   [KnownChainIds.CosmosMainnet]: [
     {
       defiProvider: DefiProvider.CosmosSdk,
       defiType: DefiType.Staking,
     },
-    {
-      defiProvider: DefiProvider.ThorchainSavers,
-      defiType: DefiType.Staking,
-    },
   ],
   [KnownChainIds.OptimismMainnet]: [],
   [KnownChainIds.PolygonMainnet]: [],
   [KnownChainIds.GnosisMainnet]: [],
   [KnownChainIds.ThorchainMainnet]: [
     {
-      defiProvider: DefiProvider.ThorchainSavers,
+      defiProvider: DefiProvider.RunePool,
       defiType: DefiType.Staking,
     },
   ],
diff --git a/src/state/slices/opportunitiesSlice/opportunitiesSlice.test.ts b/src/state/slices/opportunitiesSlice/opportunitiesSlice.test.ts
index b0b6403ad96..1115bcc3aa8 100644
--- a/src/state/slices/opportunitiesSlice/opportunitiesSlice.test.ts
+++ b/src/state/slices/opportunitiesSlice/opportunitiesSlice.test.ts
@@ -26,7 +26,7 @@ describe('opportunitiesSlice', () => {
       ...initialState,
       _persist: {
         rehydrated: true,
-        version: 6,
+        version: 7,
       },
     })
   })
diff --git a/src/state/slices/opportunitiesSlice/resolvers/runepool/index.ts b/src/state/slices/opportunitiesSlice/resolvers/runepool/index.ts
new file mode 100644
index 00000000000..d1e1a3848f8
--- /dev/null
+++ b/src/state/slices/opportunitiesSlice/resolvers/runepool/index.ts
@@ -0,0 +1,292 @@
+import type { AssetId } from '@shapeshiftoss/caip'
+import { thorchainAssetId } from '@shapeshiftoss/caip'
+import type { ThornodePoolResponse } from '@shapeshiftoss/swapper'
+import { thorPoolAssetIdToAssetId } from '@shapeshiftoss/swapper'
+import { BigAmount, isSome } from '@shapeshiftoss/utils'
+import axios from 'axios'
+
+import type {
+  GetOpportunityIdsOutput,
+  GetOpportunityMetadataOutput,
+  GetOpportunityUserStakingDataOutput,
+  OpportunitiesState,
+  OpportunityMetadata,
+  StakingId,
+} from '../../types'
+import { DefiProvider, DefiType } from '../../types'
+import { serializeUserStakingId } from '../../utils'
+import type {
+  OpportunitiesMetadataResolverInput,
+  OpportunitiesUserDataResolverInput,
+} from '../types'
+import type {
+  ThorchainRunepoolInformationResponseSuccess,
+  ThorchainRunepoolMemberPositionResponse,
+  ThorchainRunepoolReservePositionsResponse,
+} from './types'
+import { getRunePoolPosition } from './utils'
+
+import { getConfig } from '@/config'
+import { queryClient } from '@/context/QueryClientProvider/queryClient'
+import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
+import { fromThorBaseUnit } from '@/lib/utils/thorchain'
+import { selectRunePoolMaturityTime } from '@/lib/utils/thorchain/selectors'
+import type { ThorchainMimir } from '@/lib/utils/thorchain/types'
+import { thornode } from '@/react-queries/queries/thornode'
+import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
+import { selectMarketDataByAssetIdUserCurrency } from '@/state/slices/marketDataSlice/selectors'
+
+export const runePoolOpportunityIdsResolver = (): Promise<{
+  data: GetOpportunityIdsOutput
+}> => {
+  const opportunityIds: StakingId[] = []
+
+  if (getConfig().VITE_FEATURE_RUNEPOOL) {
+    opportunityIds.push(thorchainAssetId as StakingId)
+  }
+
+  return Promise.resolve({
+    data: opportunityIds,
+  })
+}
+
+export const runePoolStakingOpportunitiesMetadataResolver = async ({
+  opportunityIds,
+  defiType,
+  reduxApi,
+}: OpportunitiesMetadataResolverInput): Promise<{
+  data: GetOpportunityMetadataOutput
+}> => {
+  const { getState } = reduxApi
+  const state: any = getState() // ReduxState causes circular dependency
+
+  const stakingOpportunitiesById: Record<StakingId, OpportunityMetadata> = {}
+
+  const thorchainAsset = selectAssetById(state, thorchainAssetId)
+
+  if (!opportunityIds?.length || !thorchainAsset) {
+    return {
+      data: {
+        byId: stakingOpportunitiesById,
+        type: defiType,
+      },
+    }
+  }
+
+  const thorchainPools = await queryClient.fetchQuery({
+    ...thornode.poolsData(),
+    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
+    // Infinity staleTime as we handle halted state JIT
+    staleTime: Infinity,
+  })
+
+  if (!thorchainPools.length) {
+    throw new Error('Error fetching THORChain pools')
+  }
+
+  const { data: reservePositions } = await axios.get<ThorchainRunepoolReservePositionsResponse>(
+    `${getConfig().VITE_THORCHAIN_MIDGARD_URL}/member/thor1dheycdevq39qlkxs2a6wuuzyn4aqxhve4qxtxt`,
+  )
+  const { data: runepoolInformation } =
+    await axios.get<ThorchainRunepoolInformationResponseSuccess>(
+      `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/runepool`,
+    )
+
+  const poolsByAssetid = thorchainPools.reduce<Record<string, ThornodePoolResponse>>(
+    (acc, pool) => {
+      const assetId = thorPoolAssetIdToAssetId(pool.asset)
+
+      if (!assetId) return acc
+
+      return {
+        ...acc,
+        [assetId]: pool,
+      }
+    },
+    {},
+  )
+
+  const underlyingAssetIds = reservePositions.pools
+    .map(pool => thorPoolAssetIdToAssetId(pool.pool))
+    .filter(assetId => isSome(assetId)) as AssetId[]
+
+  const totalRuneAmount = reservePositions.pools.reduce((acc, pool) => {
+    const assetId = thorPoolAssetIdToAssetId(pool.pool)
+
+    if (!assetId) return acc
+
+    const share = bnOrZero(pool.liquidityUnits).div(poolsByAssetid[assetId].pool_units)
+    const runeAmount = share.times(poolsByAssetid[assetId].balance_rune)
+
+    return acc.plus(runeAmount)
+  }, bn(0))
+
+  const { underlyingAssetRatiosBaseUnit, underlyingAssetWeightPercentageDecimal } =
+    reservePositions.pools.reduce(
+      (acc, pool) => {
+        const assetId = thorPoolAssetIdToAssetId(pool.pool)
+
+        if (!assetId) return acc
+
+        const thorchainPool = poolsByAssetid[assetId]
+
+        if (!thorchainPool) return acc
+
+        const share = bnOrZero(pool.liquidityUnits).div(thorchainPool.pool_units)
+
+        const runeAmount = share.times(bnOrZero(thorchainPool.balance_rune))
+
+        const assetAmount = share.times(thorchainPool.balance_asset)
+
+        const poolWeightPercentageDecimal = bnOrZero(runeAmount).div(totalRuneAmount)
+
+        const poolRatio = bnOrZero(assetAmount).div(runeAmount)
+
+        const adjustedRatio = poolRatio.times(poolWeightPercentageDecimal)
+
+        const asset = selectAssetById(state, assetId)
+
+        if (!asset) return acc
+
+        return {
+          underlyingAssetRatiosBaseUnit: [
+            ...acc.underlyingAssetRatiosBaseUnit,
+            BigAmount.fromPrecision({
+              value: adjustedRatio.toFixed(),
+              precision: asset.precision,
+            }).toBaseUnit(),
+          ],
+          underlyingAssetWeightPercentageDecimal: [
+            ...acc.underlyingAssetWeightPercentageDecimal,
+            poolWeightPercentageDecimal.toFixed(),
+          ],
+        }
+      },
+      {
+        underlyingAssetRatiosBaseUnit: [] as string[],
+        underlyingAssetWeightPercentageDecimal: [] as string[],
+      },
+    )
+
+  const runeMarketData = selectMarketDataByAssetIdUserCurrency(state, thorchainAssetId)
+
+  stakingOpportunitiesById[thorchainAssetId as StakingId] = {
+    // RUNEPool doesn't have any APY for now
+    // @TODO: calculate proper APY at opportunity meta time by doing some homemade mathematics
+    apy: undefined,
+    assetId: thorchainAssetId,
+    id: thorchainAssetId as StakingId,
+    provider: DefiProvider.RunePool,
+    tvl: fromThorBaseUnit(runepoolInformation.providers.value)
+      .times(bnOrZero(runeMarketData?.price))
+      .toFixed(),
+    type: DefiType.Staking,
+    underlyingAssetId: thorchainAssetId,
+    underlyingAssetIds,
+    rewardAssetIds: [thorchainAssetId] as [AssetId],
+    underlyingAssetRatiosBaseUnit,
+    underlyingAssetWeightPercentageDecimal,
+    name: thorchainAsset.symbol,
+    isClaimableRewards: false,
+  }
+
+  return {
+    data: {
+      byId: stakingOpportunitiesById,
+      type: defiType,
+    },
+  }
+}
+
+export const runePoolStakingOpportunitiesUserDataResolver = async ({
+  defiType,
+  accountId,
+  reduxApi,
+  opportunityIds,
+}: OpportunitiesUserDataResolverInput): Promise<{ data: GetOpportunityUserStakingDataOutput }> => {
+  const { getState } = reduxApi
+  const state: any = getState() // ReduxState causes circular dependency
+
+  const stakingOpportunitiesUserDataByUserStakingId: OpportunitiesState['userStaking']['byId'] = {}
+  const data = {
+    byId: stakingOpportunitiesUserDataByUserStakingId,
+    type: defiType,
+  }
+
+  try {
+    const { data: mimir } = await axios.get<ThorchainMimir>(
+      `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/mimir`,
+    )
+
+    const runePoolDepositMaturityTime = selectRunePoolMaturityTime(mimir)
+
+    for (const stakingOpportunityId of opportunityIds) {
+      const asset = selectAssetById(state, stakingOpportunityId)
+      if (!asset)
+        throw new Error(`Cannot get asset for stakingOpportunityId: ${stakingOpportunityId}`)
+
+      const userStakingId = serializeUserStakingId(accountId, stakingOpportunityId)
+
+      const position = await getRunePoolPosition(accountId)
+
+      // No position - either it was never deposited into, or fully withdrawn
+      if (!position) {
+        stakingOpportunitiesUserDataByUserStakingId[userStakingId] = {
+          isLoaded: true,
+          userStakingId,
+          stakedAmountCryptoBaseUnit: '0',
+          rewardsCryptoBaseUnit: { amounts: ['0'], claimable: false },
+        }
+        continue
+      }
+
+      const stakedAmountCryptoBaseUnit = bn(
+        BigAmount.fromPrecision({
+          value: fromThorBaseUnit(position.depositValueThorBaseUnit).toFixed(),
+          precision: asset.precision,
+        }).toBaseUnit(),
+      ) // to actual asset precision base unit
+
+      const stakedAmountCryptoBaseUnitIncludeRewards = bn(
+        BigAmount.fromPrecision({
+          value: fromThorBaseUnit(position.redeemValueThorBaseUnit).toFixed(),
+          precision: asset.precision,
+        }).toBaseUnit(),
+      ) // to actual asset precision base unit
+
+      const rewardsAmountsCryptoBaseUnit: [string] = [
+        stakedAmountCryptoBaseUnitIncludeRewards.minus(stakedAmountCryptoBaseUnit).toFixed(0),
+      ]
+
+      const dateUnlocked = await (async () => {
+        try {
+          const { data } = await axios.get<[ThorchainRunepoolMemberPositionResponse]>(
+            `${getConfig().VITE_THORCHAIN_MIDGARD_URL}/runepool/${position.address}`,
+          )
+
+          return bnOrZero(data[0].dateLastAdded).plus(runePoolDepositMaturityTime).toNumber()
+        } catch (error) {
+          if (axios.isAxiosError(error) && error.response?.status === 404) return
+          throw new Error('Error fetching RUNEPool date last added')
+        }
+      })()
+
+      stakingOpportunitiesUserDataByUserStakingId[userStakingId] = {
+        isLoaded: true,
+        userStakingId,
+        stakedAmountCryptoBaseUnit: stakedAmountCryptoBaseUnit.toFixed(0),
+        rewardsCryptoBaseUnit: { amounts: rewardsAmountsCryptoBaseUnit, claimable: false },
+        dateUnlocked,
+      }
+    }
+
+    return Promise.resolve({ data })
+  } catch (e) {
+    return Promise.resolve({
+      data: {
+        byId: stakingOpportunitiesUserDataByUserStakingId,
+        type: defiType,
+      },
+    })
+  }
+}
diff --git a/src/state/slices/opportunitiesSlice/resolvers/runepool/types.ts b/src/state/slices/opportunitiesSlice/resolvers/runepool/types.ts
new file mode 100644
index 00000000000..1f156968bd7
--- /dev/null
+++ b/src/state/slices/opportunitiesSlice/resolvers/runepool/types.ts
@@ -0,0 +1,63 @@
+export type ThorchainRunepoolInformationResponseSuccess = {
+  pol: {
+    rune_deposited: string
+    rune_withdrawn: string
+    value: string
+    pnl: string
+    current_deposit: string
+  }
+  providers: {
+    units: string
+    pending_units: string
+    pending_rune: string
+    value: string
+    pnl: string
+    current_deposit: string
+  }
+  reserve: {
+    units: string
+    value: string
+    pnl: string
+    current_deposit: string
+  }
+}
+
+export type ThorchainRunepoolProviderResponseSuccess = {
+  rune_address: string
+  units: string
+  value: string
+  pnl: string
+  deposit_amount: string
+  withdraw_amount: string
+  last_deposit_height: number
+  last_withdraw_height: number
+}
+
+export type ThorchainRunepoolReservePositionsResponse = {
+  pools: {
+    assetAdded: string
+    assetAddress: string
+    assetDeposit: string
+    assetPending: string
+    assetWithdrawn: string
+    dateFirstAdded: string
+    dateLastAdded: string
+    liquidityUnits: string
+    pool: string
+    runeAdded: string
+    runeAddress: string
+    runeDeposit: string
+    runePending: string
+    runeWithdrawn: string
+  }[]
+}
+
+export type ThorchainRunepoolMemberPositionResponse = {
+  runeAddress: string
+  units: string
+  runeAdded: string
+  runeDeposit: string
+  runeWithdrawn: string
+  dateFirstAdded: string
+  dateLastAdded: string
+}
diff --git a/src/state/slices/opportunitiesSlice/resolvers/runepool/utils.ts b/src/state/slices/opportunitiesSlice/resolvers/runepool/utils.ts
new file mode 100644
index 00000000000..285cb254b06
--- /dev/null
+++ b/src/state/slices/opportunitiesSlice/resolvers/runepool/utils.ts
@@ -0,0 +1,35 @@
+import type { AccountId } from '@shapeshiftoss/caip'
+import { fromAccountId } from '@shapeshiftoss/caip'
+import axios from 'axios'
+
+import type { ThorchainRunepoolProviderResponseSuccess } from './types'
+
+import { getConfig } from '@/config'
+import { bnOrZero } from '@/lib/bignumber/bignumber'
+
+export type RunePoolPosition = {
+  address: string
+  depositValueThorBaseUnit: string
+  redeemValueThorBaseUnit: string
+}
+
+export const getRunePoolPosition = async (
+  accountId: AccountId,
+): Promise<RunePoolPosition | null> => {
+  const address = fromAccountId(accountId).account
+
+  const { data: runepoolInformation } = await axios.get<ThorchainRunepoolProviderResponseSuccess>(
+    `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/rune_provider/${address}`,
+  )
+
+  if (bnOrZero(runepoolInformation.units).isZero()) return null
+
+  return {
+    address: runepoolInformation.rune_address,
+    depositValueThorBaseUnit: bnOrZero(runepoolInformation.deposit_amount)
+      .minus(runepoolInformation.withdraw_amount)
+      .plus(runepoolInformation.pnl)
+      .toFixed(),
+    redeemValueThorBaseUnit: runepoolInformation.value,
+  }
+}
diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainLending/types.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainLending/types.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/index.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/index.ts
deleted file mode 100644
index 6e7ed81fc65..00000000000
--- a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/index.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import type { AssetId } from '@shapeshiftoss/caip'
-import { thorchainAssetId } from '@shapeshiftoss/caip'
-import type { ThornodePoolResponse } from '@shapeshiftoss/swapper'
-import { thorPoolAssetIdToAssetId } from '@shapeshiftoss/swapper'
-import { BigAmount, isSome } from '@shapeshiftoss/utils'
-import axios from 'axios'
-
-import type {
-  GetOpportunityIdsOutput,
-  GetOpportunityMetadataOutput,
-  GetOpportunityUserStakingDataOutput,
-  OpportunitiesState,
-  OpportunityId,
-  OpportunityMetadata,
-  StakingId,
-} from '../../types'
-import { DefiProvider, DefiType } from '../../types'
-import { serializeUserStakingId } from '../../utils'
-import type {
-  OpportunitiesMetadataResolverInput,
-  OpportunitiesUserDataResolverInput,
-} from '../types'
-import type {
-  MidgardSaverResponse,
-  ThorchainRunepoolInformationResponseSuccess,
-  ThorchainRunepoolMemberPositionResponse,
-  ThorchainRunepoolReservePositionsResponse,
-} from './types'
-import { getMidgardPools, getThorchainSaversPosition } from './utils'
-
-import { getConfig } from '@/config'
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { bn, bnOrZero } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit } from '@/lib/utils/thorchain'
-import {
-  selectLiquidityLockupTime,
-  selectRunePoolMaturityTime,
-} from '@/lib/utils/thorchain/selectors'
-import type { ThorchainMimir } from '@/lib/utils/thorchain/types'
-import { thornode } from '@/react-queries/queries/thornode'
-import { selectAssetById } from '@/state/slices/assetsSlice/selectors'
-import { selectMarketDataByAssetIdUserCurrency } from '@/state/slices/marketDataSlice/selectors'
-import { preferences } from '@/state/slices/preferencesSlice/preferencesSlice'
-
-export const thorchainSaversOpportunityIdsResolver = async (): Promise<{
-  data: GetOpportunityIdsOutput
-  // eslint-disable-next-line require-await
-}> => {
-  const opportunityIds: StakingId[] = []
-
-  if (getConfig().VITE_FEATURE_RUNEPOOL) {
-    opportunityIds.push(thorchainAssetId as StakingId)
-  }
-
-  return Promise.resolve({
-    data: opportunityIds,
-  })
-}
-
-export const thorchainSaversStakingOpportunitiesMetadataResolver = async ({
-  opportunityIds,
-  defiType,
-  reduxApi,
-}: OpportunitiesMetadataResolverInput): Promise<{
-  data: GetOpportunityMetadataOutput
-}> => {
-  const { getState } = reduxApi
-  const state: any = getState() // ReduxState causes circular dependency
-
-  const { SaversVaults } = preferences.selectors.selectFeatureFlags(state)
-
-  if (!(SaversVaults && opportunityIds?.length)) {
-    return Promise.resolve({
-      data: {
-        byId: {},
-        type: defiType,
-      },
-    })
-  }
-
-  const midgardPools = await getMidgardPools('7d')
-
-  // It might be tempting to paralelize the two THOR requests - don't
-  // Midgard is less reliable, so there's no point to continue the flow if this fails
-  if (!midgardPools.length) {
-    throw new Error('Error fetching THORChain midgard pools')
-  }
-
-  const thorchainPools = await queryClient.fetchQuery({
-    ...thornode.poolsData(),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    // Infinity staleTime as we handle halted state JIT
-    staleTime: Infinity,
-  })
-
-  if (!thorchainPools.length) {
-    throw new Error('Error fetching THORChain pools')
-  }
-
-  const availablePools = thorchainPools.filter(pool => pool.status === 'Available')
-
-  const stakingOpportunitiesById: Record<StakingId, OpportunityMetadata> = {}
-
-  for (const thorchainPool of availablePools) {
-    const assetId = thorPoolAssetIdToAssetId(thorchainPool.asset)
-    if (!assetId || !opportunityIds.includes(assetId as OpportunityId)) continue
-
-    const opportunityId = assetId as StakingId
-
-    // Thorchain is slightly different from other opportunities in that there is no contract address for the opportunity
-    // The way we represent it, the opportunityId is both the opportunityId/assetId and the underlyingAssetId
-    // That's an oversimplification, as this ties a native AssetId e.g btcAssetId or ethAssetId, to a Savers opportunity
-    // If we were to ever support another native asset staking opportunity e.g Ethereum 2.0 consensus layer staking
-    // we would need to revisit this by using generic keys as an opportunityId
-    const asset = selectAssetById(state, assetId)
-    const underlyingAsset = selectAssetById(state, assetId)
-    const marketData = selectMarketDataByAssetIdUserCurrency(state, assetId)
-
-    if (!asset || !underlyingAsset || !marketData) continue
-
-    const apy = bnOrZero(
-      midgardPools.find(pool => pool.asset === thorchainPool.asset)?.saversAPR,
-    ).toString()
-    const tvl = fromThorBaseUnit(thorchainPool.synth_supply)
-      .times(bnOrZero(marketData?.price))
-      .toFixed()
-    const saversMaxSupplyUserCurrency = fromThorBaseUnit(
-      bnOrZero(thorchainPool.synth_supply).plus(thorchainPool.synth_supply_remaining),
-    )
-      .times(bnOrZero(marketData?.price))
-      .toFixed()
-
-    const underlyingAssetRatioBaseUnit = BigAmount.fromPrecision({
-      value: '1',
-      precision: asset.precision,
-    }).toBaseUnit()
-    stakingOpportunitiesById[opportunityId] = {
-      apy,
-      assetId,
-      id: opportunityId,
-      provider: DefiProvider.ThorchainSavers,
-      tvl,
-      type: DefiType.Staking,
-      underlyingAssetId: assetId,
-      underlyingAssetIds: [assetId] as [AssetId],
-      rewardAssetIds: [assetId] as [AssetId],
-      // Thorchain opportunities represent a single native asset being staked, so the ratio will always be 1
-      underlyingAssetRatiosBaseUnit: [underlyingAssetRatioBaseUnit],
-      name: underlyingAsset.symbol,
-      saversMaxSupplyFiat: saversMaxSupplyUserCurrency,
-      isFull: thorchainPool.synth_mint_paused,
-      isClaimableRewards: false,
-    }
-  }
-
-  const thorchainAsset = selectAssetById(state, thorchainAssetId)
-
-  if (getConfig().VITE_FEATURE_RUNEPOOL && thorchainAsset) {
-    const { data: reservePositions } = await axios.get<ThorchainRunepoolReservePositionsResponse>(
-      `${
-        getConfig().VITE_THORCHAIN_MIDGARD_URL
-      }/member/thor1dheycdevq39qlkxs2a6wuuzyn4aqxhve4qxtxt`,
-    )
-    const { data: runepoolInformation } =
-      await axios.get<ThorchainRunepoolInformationResponseSuccess>(
-        `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/runepool`,
-      )
-
-    const poolsByAssetid = thorchainPools.reduce<Record<string, ThornodePoolResponse>>(
-      (acc, pool) => {
-        const assetId = thorPoolAssetIdToAssetId(pool.asset)
-
-        if (!assetId) return acc
-
-        return {
-          ...acc,
-          [assetId]: pool,
-        }
-      },
-      {},
-    )
-
-    const underlyingAssetIds = reservePositions.pools
-      .map(pool => thorPoolAssetIdToAssetId(pool.pool))
-      .filter(assetId => isSome(assetId)) as AssetId[]
-
-    const totalRuneAmount = reservePositions.pools.reduce((acc, pool) => {
-      const assetId = thorPoolAssetIdToAssetId(pool.pool)
-
-      if (!assetId) return acc
-
-      const share = bnOrZero(pool.liquidityUnits).div(poolsByAssetid[assetId].pool_units)
-      const runeAmount = share.times(poolsByAssetid[assetId].balance_rune)
-
-      return acc.plus(runeAmount)
-    }, bn(0))
-
-    const { underlyingAssetRatiosBaseUnit, underlyingAssetWeightPercentageDecimal } =
-      reservePositions.pools.reduce(
-        (acc, pool) => {
-          const assetId = thorPoolAssetIdToAssetId(pool.pool)
-
-          if (!assetId) return acc
-
-          const thorchainPool = poolsByAssetid[assetId]
-
-          if (!thorchainPool) return acc
-
-          const share = bnOrZero(pool.liquidityUnits).div(thorchainPool.pool_units)
-
-          const runeAmount = share.times(bnOrZero(thorchainPool.balance_rune))
-
-          const assetAmount = share.times(thorchainPool.balance_asset)
-
-          const poolWeightPercentageDecimal = bnOrZero(runeAmount).div(totalRuneAmount)
-
-          const poolRatio = bnOrZero(assetAmount).div(runeAmount)
-
-          const adjustedRatio = poolRatio.times(poolWeightPercentageDecimal)
-
-          const asset = selectAssetById(state, assetId)
-
-          if (!asset) return acc
-
-          return {
-            underlyingAssetRatiosBaseUnit: [
-              ...acc.underlyingAssetRatiosBaseUnit,
-              BigAmount.fromPrecision({
-                value: adjustedRatio.toFixed(),
-                precision: asset.precision,
-              }).toBaseUnit(),
-            ],
-            underlyingAssetWeightPercentageDecimal: [
-              ...acc.underlyingAssetWeightPercentageDecimal,
-              poolWeightPercentageDecimal.toFixed(),
-            ],
-          }
-        },
-        {
-          underlyingAssetRatiosBaseUnit: [] as string[],
-          underlyingAssetWeightPercentageDecimal: [] as string[],
-        },
-      )
-
-    const runeMarketData = selectMarketDataByAssetIdUserCurrency(state, thorchainAssetId)
-
-    stakingOpportunitiesById[thorchainAssetId as StakingId] = {
-      // RUNEPool doesn't have any APY for now
-      // @TODO: calculate proper APY at opportunity meta time by doing some homemade mathematics
-      apy: undefined,
-      assetId: thorchainAssetId,
-      id: thorchainAssetId as StakingId,
-      provider: DefiProvider.ThorchainSavers,
-      tvl: fromThorBaseUnit(runepoolInformation.providers.value)
-        .times(bnOrZero(runeMarketData?.price))
-        .toFixed(),
-      type: DefiType.Staking,
-      underlyingAssetId: thorchainAssetId,
-      underlyingAssetIds,
-      rewardAssetIds: [thorchainAssetId] as [AssetId],
-      underlyingAssetRatiosBaseUnit,
-      underlyingAssetWeightPercentageDecimal,
-      name: thorchainAsset.symbol,
-      saversMaxSupplyFiat: undefined,
-      isFull: false,
-      isClaimableRewards: false,
-    }
-  }
-
-  const data = {
-    byId: stakingOpportunitiesById,
-    type: defiType,
-  }
-
-  return { data }
-}
-
-export const thorchainSaversStakingOpportunitiesUserDataResolver = async ({
-  defiType,
-  accountId,
-  reduxApi,
-  opportunityIds,
-}: OpportunitiesUserDataResolverInput): Promise<{ data: GetOpportunityUserStakingDataOutput }> => {
-  const { getState } = reduxApi
-  const state: any = getState() // ReduxState causes circular dependency
-
-  const stakingOpportunitiesUserDataByUserStakingId: OpportunitiesState['userStaking']['byId'] = {}
-  const data = {
-    byId: stakingOpportunitiesUserDataByUserStakingId,
-    type: defiType,
-  }
-
-  try {
-    const { data: mimir } = await axios.get<ThorchainMimir>(
-      `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/mimir`,
-    )
-
-    const liquidityLockupTime = selectLiquidityLockupTime(mimir)
-    const runePoolDepositMaturityTime = selectRunePoolMaturityTime(mimir)
-
-    for (const stakingOpportunityId of opportunityIds) {
-      const asset = selectAssetById(state, stakingOpportunityId)
-      if (!asset)
-        throw new Error(`Cannot get asset for stakingOpportunityId: ${stakingOpportunityId}`)
-
-      const userStakingId = serializeUserStakingId(accountId, stakingOpportunityId)
-
-      const accountPosition = await getThorchainSaversPosition({
-        accountId,
-        assetId: stakingOpportunityId,
-      })
-
-      // No position on that pool - either it was never staked in, or fully withdrawn
-      if (!accountPosition) {
-        stakingOpportunitiesUserDataByUserStakingId[userStakingId] = {
-          isLoaded: true,
-          userStakingId,
-          stakedAmountCryptoBaseUnit: '0',
-          rewardsCryptoBaseUnit: { amounts: ['0'], claimable: false },
-        }
-        continue
-      }
-
-      const { asset_deposit_value, asset_redeem_value, asset_address } = accountPosition
-
-      const stakedAmountCryptoBaseUnit = bn(
-        BigAmount.fromPrecision({
-          value: fromThorBaseUnit(asset_deposit_value).toFixed(),
-          precision: asset.precision,
-        }).toBaseUnit(),
-      ) // to actual asset precision base unit
-
-      const stakedAmountCryptoBaseUnitIncludeRewards = bn(
-        BigAmount.fromPrecision({
-          value: fromThorBaseUnit(asset_redeem_value).toFixed(),
-          precision: asset.precision,
-        }).toBaseUnit(),
-      ) // to actual asset precision base unit
-
-      const rewardsAmountsCryptoBaseUnit: [string] = [
-        stakedAmountCryptoBaseUnitIncludeRewards.minus(stakedAmountCryptoBaseUnit).toFixed(0),
-      ]
-
-      const dateUnlocked = await (async () => {
-        try {
-          if (stakingOpportunityId === thorchainAssetId) {
-            const { data } = await axios.get<[ThorchainRunepoolMemberPositionResponse]>(
-              `${getConfig().VITE_THORCHAIN_MIDGARD_URL}/runepool/${asset_address}`,
-            )
-
-            return bnOrZero(data[0].dateLastAdded).plus(runePoolDepositMaturityTime).toNumber()
-          }
-
-          const { data } = await axios.get<MidgardSaverResponse>(
-            `${getConfig().VITE_THORCHAIN_MIDGARD_URL}/saver/${asset_address}`,
-          )
-
-          const dateLastAdded = data.pools.find(({ pool }) => pool === accountPosition.asset)
-            ?.dateLastAdded
-
-          return dateLastAdded
-            ? bnOrZero(dateLastAdded).plus(liquidityLockupTime).toNumber()
-            : undefined
-        } catch (error) {
-          if (axios.isAxiosError(error) && error.response?.status === 404) return
-          throw new Error('Error fetching savers date last added')
-        }
-      })()
-
-      stakingOpportunitiesUserDataByUserStakingId[userStakingId] = {
-        isLoaded: true,
-        userStakingId,
-        stakedAmountCryptoBaseUnit: stakedAmountCryptoBaseUnit.toFixed(0),
-        rewardsCryptoBaseUnit: { amounts: rewardsAmountsCryptoBaseUnit, claimable: false },
-        dateUnlocked,
-      }
-    }
-
-    return Promise.resolve({ data })
-  } catch (e) {
-    return Promise.resolve({
-      data: {
-        byId: stakingOpportunitiesUserDataByUserStakingId,
-        type: defiType,
-      },
-    })
-  }
-}
diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types.ts
deleted file mode 100644
index 6da02866983..00000000000
--- a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/types.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import type { DefiProvider, DefiType, OpportunityMetadataBase } from '../../types'
-
-import type { QuoteFees } from '@/lib/utils/thorchain/lending/types'
-
-export type ThorchainSaversStakingSpecificMetadata = OpportunityMetadataBase & {
-  provider: DefiProvider.ThorchainSavers
-  type: DefiType.Staking
-  saversMaxSupplyFiat: string | undefined
-  isFull: boolean
-}
-
-type MidgardPoolStatus = 'available' | 'staged' | 'suspended'
-export type MidgardPoolPeriod =
-  | '1h'
-  | '24h'
-  | '7d'
-  | '14d'
-  | '30d'
-  | '90d'
-  | '100d'
-  | '180d'
-  | '365d'
-  | 'all'
-
-export type MidgardPoolRequest = {
-  status?: MidgardPoolStatus
-  period?: MidgardPoolPeriod
-}
-export type MidgardPoolResponse = {
-  annualPercentageRate: string
-  asset: string
-  assetDepth: string
-  assetPrice: string
-  assetPriceUSD: string
-  liquidityUnits: string
-  nativeDecimal: string
-  poolAPY: string
-  runeDepth: string
-  saversAPR: string
-  saversDepth: string
-  saversUnits: string
-  status: string
-  synthSupply: string
-  synthUnits: string
-  units: string
-  volume24h: string
-}
-
-export type MidgardSaverResponse = {
-  pools: {
-    assetAdded: string
-    assetAddress: string
-    assetDeposit: string
-    assetRedeem: string
-    assetWithdrawn: string
-    dateFirstAdded: string
-    dateLastAdded: string
-    pool: string
-    saverUnits: string
-  }[]
-}
-
-export type ThorchainSaverPositionResponse = {
-  asset: string
-  asset_address: string
-  last_add_height: number | undefined
-  units: string
-  asset_deposit_value: string
-  asset_redeem_value: string
-  growth_pct: string | undefined
-}
-
-export type ThorchainSaversCommonQuoteResponseSuccess = {
-  expiry: string // TODO(gomes): guard against expired quote
-  dust_threshold: string
-  expected_amount_out: string
-  fees: QuoteFees
-  inbound_address: string
-  memo: string
-  notes: string
-  warning: string
-}
-
-export type ThorchainSaversCommonQuoteResponseError = {
-  error: string
-}
-
-export type ThorchainSaversDepositQuoteResponseSuccess =
-  ThorchainSaversCommonQuoteResponseSuccess & {
-    inbound_confirmation_blocks: number
-    expected_amount_deposit: string
-    /** @deprecated use expected_amount_deposit instead */
-    expected_amount_out: string
-  }
-
-export type ThorchainSaversWithdrawQuoteResponseSuccess =
-  ThorchainSaversCommonQuoteResponseSuccess & {
-    outbound_delay_blocks: number
-    outbound_delay_seconds: number
-    dust_amount: string
-  }
-
-export type ThorchainSaversDepositQuoteResponse =
-  | ThorchainSaversDepositQuoteResponseSuccess
-  | ThorchainSaversCommonQuoteResponseError
-
-export type ThorchainSaversWithdrawQuoteResponse =
-  | ThorchainSaversWithdrawQuoteResponseSuccess
-  | ThorchainSaversCommonQuoteResponseError
-
-export type ThorchainRunepoolInformationResponseSuccess = {
-  pol: {
-    rune_deposited: string
-    rune_withdrawn: string
-    value: string
-    pnl: string
-    current_deposit: string
-  }
-  providers: {
-    units: string
-    pending_units: string
-    pending_rune: string
-    value: string
-    pnl: string
-    current_deposit: string
-  }
-  reserve: {
-    units: string
-    value: string
-    pnl: string
-    current_deposit: string
-  }
-}
-
-export type ThorchainRunepoolProviderResponseSuccess = {
-  rune_address: string
-  units: string
-  value: string
-  pnl: string
-  deposit_amount: string
-  withdraw_amount: string
-  last_deposit_height: number
-  last_withdraw_height: number
-}
-
-export type ThorchainRunepoolReservePositionsResponse = {
-  pools: {
-    assetAdded: string
-    assetAddress: string
-    assetDeposit: string
-    assetPending: string
-    assetWithdrawn: string
-    dateFirstAdded: string
-    dateLastAdded: string
-    liquidityUnits: string
-    pool: string
-    runeAdded: string
-    runeAddress: string
-    runeDeposit: string
-    runePending: string
-    runeWithdrawn: string
-  }[]
-}
-
-export type ThorchainRunepoolMemberPositionResponse = {
-  runeAddress: string
-  units: string
-  runeAdded: string
-  runeDeposit: string
-  runeWithdrawn: string
-  dateFirstAdded: string
-  dateLastAdded: string
-}
diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.test.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.test.ts
deleted file mode 100644
index a45cf5a91f0..00000000000
--- a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { btcAssetId } from '@shapeshiftoss/caip'
-import { describe, expect, it, vi } from 'vitest'
-
-import { getMaybeThorchainSaversDepositQuote } from './utils'
-
-import { getAssetService } from '@/lib/asset-service'
-
-const mocks = vi.hoisted(() => {
-  const BTC_ASSET_ID = 'bip122:000000000019d6689c085ae165831e93/slip44:0'
-  const BTC_CHAIN_ID = 'bip122:000000000019d6689c085ae165831e93'
-
-  return {
-    get: vi.fn(),
-    post: vi.fn(),
-    mockBtcAsset: {
-      assetId: BTC_ASSET_ID,
-      chainId: BTC_CHAIN_ID,
-      symbol: 'BTC',
-      name: 'Bitcoin',
-      precision: 8,
-      color: '#FF9800',
-      icon: 'https://assets.coincap.io/assets/icons/btc@2x.png',
-      explorer: 'https://live.blockcypher.com',
-      explorerTxLink: 'https://live.blockcypher.com/btc/tx/',
-      explorerAddressLink: 'https://live.blockcypher.com/btc/address/',
-      relatedAssetKey: null,
-    },
-    BTC_ASSET_ID,
-  }
-})
-
-vi.mock('@/lib/asset-service', () => ({
-  getAssetService: () => ({
-    assetsById: {
-      [mocks.BTC_ASSET_ID]: mocks.mockBtcAsset,
-    },
-  }),
-  initAssetService: vi.fn(),
-}))
-
-vi.mock('axios', () => {
-  const mockAxios = {
-    default: {
-      create: vi.fn(() => ({
-        get: mocks.get,
-        post: mocks.post,
-      })),
-    },
-  }
-
-  return {
-    default: {
-      ...mockAxios.default.create(),
-      create: mockAxios.default.create,
-    },
-  }
-})
-
-vi.mock('axios-cache-interceptor', () => {
-  return {
-    setupCache: vi.fn(axios => axios),
-    buildMemoryStorage: vi.fn(),
-  }
-})
-
-const btcQuoteResponse = {
-  expected_amount_out: '9997894',
-  fees: {
-    affiliate: '0',
-    asset: 'BTC/BTC',
-    slippage_bps: 2,
-    outbound: '0',
-  },
-  inbound_address: 'bc1q0vphqevkhc33g94pl0ctnnp58v9mcuhp4e2hnm',
-  inbound_confirmation_blocks: 1,
-  memo: '+:BTC/BTC',
-}
-
-const thorchainSaversDepositQuote = Object.assign({}, btcQuoteResponse, { memo: '+:BTC/BTC' })
-
-const thorchainErrorResponse = {
-  error: 'Invalid pool',
-}
-
-describe('resolvers/thorchainSavers/utils', () => {
-  describe('getMaybeThorchainSaversDepositQuote', () => {
-    it('gets a quote for a valid pool AssetId', async () => {
-      mocks.get.mockImplementationOnce(() =>
-        Promise.resolve({
-          data: {
-            expected_amount_out: '9997894',
-            fees: {
-              affiliate: '0',
-              asset: 'BTC/BTC',
-              slippage_bps: 2,
-              outbound: '0',
-            },
-            inbound_address: 'bc1q0vphqevkhc33g94pl0ctnnp58v9mcuhp4e2hnm',
-            inbound_confirmation_blocks: 1,
-            memo: '+:BTC/BTC',
-          },
-        }),
-      )
-
-      const assetService = getAssetService()
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const btcAssetMock = assetService.assetsById[btcAssetId]!
-      const maybeSaversQuote = await getMaybeThorchainSaversDepositQuote({
-        asset: btcAssetMock,
-        amountCryptoBaseUnit: '10000000',
-      })
-
-      expect(maybeSaversQuote.isErr()).toBe(false)
-      const saversQuote = maybeSaversQuote.unwrap()
-
-      expect(saversQuote).toMatchObject(thorchainSaversDepositQuote)
-    })
-    it('return an Err when deposit is over the max synth mint supply', async () => {
-      mocks.get.mockImplementationOnce(() =>
-        Promise.resolve({
-          data: thorchainErrorResponse,
-        }),
-      )
-
-      const assetService = getAssetService()
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const btcAssetMock = assetService.assetsById[btcAssetId]!
-      expect(
-        (
-          await getMaybeThorchainSaversDepositQuote({
-            asset: btcAssetMock,
-            amountCryptoBaseUnit: '10000000000000',
-          })
-        ).isErr(),
-      ).toBe(true)
-    })
-  })
-})
diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.ts
deleted file mode 100644
index 7bc0e5dff8c..00000000000
--- a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/utils.ts
+++ /dev/null
@@ -1,334 +0,0 @@
-import type { AccountId, AssetId, ChainId } from '@shapeshiftoss/caip'
-import {
-  avalancheAssetId,
-  bchAssetId,
-  binanceAssetId,
-  bscAssetId,
-  btcAssetId,
-  cosmosAssetId,
-  dogeAssetId,
-  ethAssetId,
-  fromAccountId,
-  fromAssetId,
-  ltcAssetId,
-  thorchainAssetId,
-  tronAssetId,
-} from '@shapeshiftoss/caip'
-import { assetIdToThorPoolAssetId } from '@shapeshiftoss/swapper'
-import type { Asset } from '@shapeshiftoss/types'
-import type { Result } from '@sniptt/monads'
-import { Err, Ok } from '@sniptt/monads'
-import axios from 'axios'
-import uniq from 'lodash/uniq'
-
-import type {
-  MidgardPoolPeriod,
-  MidgardPoolRequest,
-  MidgardPoolResponse,
-  ThorchainRunepoolProviderResponseSuccess,
-  ThorchainSaverPositionResponse,
-  ThorchainSaversDepositQuoteResponse,
-  ThorchainSaversDepositQuoteResponseSuccess,
-  ThorchainSaversWithdrawQuoteResponse,
-  ThorchainSaversWithdrawQuoteResponseSuccess,
-} from './types'
-
-import { getConfig } from '@/config'
-import { queryClient } from '@/context/QueryClientProvider/queryClient'
-import { BigNumber, bnOrZero } from '@/lib/bignumber/bignumber'
-import { fromThorBaseUnit, getAccountAddresses, toThorBaseUnit } from '@/lib/utils/thorchain'
-import { BASE_BPS_POINTS, THORCHAIN_AFFILIATE_NAME } from '@/lib/utils/thorchain/constants'
-import { isUtxoChainId } from '@/lib/utils/utxo'
-
-// BPS are needed as part of the memo, but 0bps won't incur any fees, only used for tracking purposes for now
-const AFFILIATE_BPS = 0
-
-const usdcEthereumAssetId: AssetId = 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'
-const usdcAvalancheAssetId: AssetId =
-  'eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e'
-const usdtEthereumAssetId: AssetId = 'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7'
-
-// The minimum amount to be sent both for deposit and withdraws
-// else it will be considered a dust attack and gifted to the network
-export const THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT = {
-  [btcAssetId]: '10000',
-  [bchAssetId]: '10000',
-  [ltcAssetId]: '10000',
-  [dogeAssetId]: '100000000',
-  [ethAssetId]: '10000000000',
-  [avalancheAssetId]: '10000000000',
-  [bscAssetId]: '10000000000',
-  [cosmosAssetId]: '1', // the inbound address dust_threshold is '0', but LP withdrawls fail without a dust value
-  [thorchainAssetId]: '1', // partial LP withdrawls fail without a dust value
-  [tronAssetId]: '1', // the inbound address dust_threshold is '0', but TRON rejects 0-value transactions
-  [binanceAssetId]: '0',
-  [usdcEthereumAssetId]: '0',
-  [usdtEthereumAssetId]: '0',
-  [usdcAvalancheAssetId]: '0',
-}
-
-const SUPPORTED_THORCHAIN_SAVERS_ASSET_IDS = [
-  cosmosAssetId,
-  avalancheAssetId,
-  ethAssetId,
-  bscAssetId,
-  btcAssetId,
-  bchAssetId,
-  ltcAssetId,
-  dogeAssetId,
-  usdcEthereumAssetId,
-  usdtEthereumAssetId,
-  usdcAvalancheAssetId,
-  thorchainAssetId,
-]
-
-export const SUPPORTED_THORCHAIN_SAVERS_CHAIN_IDS = uniq(
-  SUPPORTED_THORCHAIN_SAVERS_ASSET_IDS.map(assetId => fromAssetId(assetId).chainId),
-)
-
-export const getAllThorchainSaversPositions = async (
-  assetId: AssetId,
-): Promise<ThorchainSaverPositionResponse[]> => {
-  const poolId = assetIdToThorPoolAssetId({ assetId })
-
-  if (!poolId) return []
-
-  const { data: opportunitiesData } = await queryClient.fetchQuery({
-    queryKey: ['thorchainSaversPositions', poolId],
-    queryFn: () =>
-      axios.get<ThorchainSaverPositionResponse[]>(
-        `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolId}/savers`,
-      ),
-    staleTime: 60_000,
-  })
-
-  if (!opportunitiesData) return []
-
-  return opportunitiesData
-}
-
-export const getThorchainSaversPosition = async ({
-  accountId,
-  assetId,
-}: {
-  accountId: AccountId
-  assetId: AssetId
-}): Promise<ThorchainSaverPositionResponse | null> => {
-  const address = fromAccountId(accountId).account
-  const poolAssetId = assetIdToThorPoolAssetId({ assetId })
-
-  if (!poolAssetId) return null
-
-  const accountPosition = await (async () => {
-    if (assetId === thorchainAssetId) {
-      const { data: runepoolInformation } =
-        await axios.get<ThorchainRunepoolProviderResponseSuccess>(
-          `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/rune_provider/${address}`,
-        )
-
-      const runepoolOpportunity: ThorchainSaverPositionResponse = {
-        asset: 'THOR.RUNE',
-        asset_address: runepoolInformation.rune_address,
-        last_add_height: runepoolInformation.last_deposit_height,
-        units: runepoolInformation.units,
-        asset_deposit_value: bnOrZero(runepoolInformation.deposit_amount)
-          .minus(runepoolInformation.withdraw_amount)
-          .plus(runepoolInformation.pnl)
-          .toFixed(),
-        asset_redeem_value: runepoolInformation.value,
-        growth_pct: undefined,
-      }
-
-      return runepoolOpportunity
-    }
-
-    if (!isUtxoChainId(fromAssetId(assetId).chainId))
-      return (
-        await axios.get<ThorchainSaverPositionResponse>(
-          `${getConfig().VITE_THORCHAIN_NODE_URL}/thorchain/pool/${poolAssetId}/saver/${address}`,
-        )
-      ).data
-
-    const lendingPositionsResponse = await getAllThorchainSaversPositions(assetId)
-
-    const allPositions = lendingPositionsResponse
-    if (!allPositions.length) {
-      throw new Error(`No lending positions found for asset ID: ${assetId}`)
-    }
-
-    if (!allPositions.length)
-      throw new Error(`Error fetching THORCHain savers positions for assetId: ${assetId}`)
-
-    // Returns either
-    // - A tuple made of a single address for EVM and Cosmos chains since the address *is* the account
-    // - An array of many addresses for UTXOs, since an xpub can derive many many addresses
-    const accountAddresses = await getAccountAddresses(accountId)
-
-    const accountPosition = allPositions.find(
-      ({ asset_address }) =>
-        asset_address === accountAddresses.find(accountAddress => accountAddress === asset_address),
-    )
-
-    if (!accountPosition) {
-      return null
-    }
-
-    return accountPosition
-  })()
-
-  return accountPosition || null
-}
-
-export const getMaybeThorchainSaversDepositQuote = async ({
-  asset,
-  amountCryptoBaseUnit,
-}: {
-  asset: Asset
-  amountCryptoBaseUnit: BigNumber.Value | null | undefined
-}): Promise<Result<ThorchainSaversDepositQuoteResponseSuccess, string>> => {
-  const poolId = assetIdToThorPoolAssetId({ assetId: asset.assetId })
-
-  if (!poolId) return Err(`Invalid assetId for THORCHain savers: ${asset.assetId}`)
-
-  const amountThorBaseUnit = toThorBaseUnit({
-    valueCryptoBaseUnit: amountCryptoBaseUnit,
-    asset,
-  }).toString()
-
-  const { data: quoteData } = await axios.get<ThorchainSaversDepositQuoteResponse>(
-    `${
-      getConfig().VITE_THORCHAIN_NODE_URL
-    }/thorchain/quote/saver/deposit?asset=${poolId}&amount=${amountThorBaseUnit}&affiliate=${THORCHAIN_AFFILIATE_NAME}&affiliate_bps=${AFFILIATE_BPS}`,
-  )
-
-  if (!quoteData || 'error' in quoteData)
-    return Err(`Error fetching THORChain savers quote: ${quoteData?.error}`)
-
-  return Ok(quoteData)
-}
-
-export const getThorchainSaversWithdrawQuote = async ({
-  asset,
-  accountId,
-  bps,
-}: {
-  asset: Asset
-  accountId: AccountId
-  bps: string
-}): Promise<Result<ThorchainSaversWithdrawQuoteResponseSuccess, string>> => {
-  const poolId = assetIdToThorPoolAssetId({ assetId: asset.assetId })
-
-  if (!poolId) return Err(`Invalid assetId for THORCHain savers: ${asset.assetId}`)
-
-  const accountAddresses = await getAccountAddresses(accountId)
-
-  const allPositions = await getAllThorchainSaversPositions(asset.assetId)
-
-  if (!allPositions.length)
-    return Err(`Error fetching THORCHain savers positions for assetId: ${asset.assetId}`)
-
-  const accountPosition = allPositions.find(
-    ({ asset_address }) =>
-      asset_address === accountAddresses.find(accountAddress => accountAddress === asset_address),
-  )
-
-  if (!accountPosition) return Err('No THORChain savers position found')
-
-  const { asset_address } = accountPosition
-
-  const { data: quoteData } = await axios.get<ThorchainSaversWithdrawQuoteResponse>(
-    `${
-      getConfig().VITE_THORCHAIN_NODE_URL
-    }/thorchain/quote/saver/withdraw?asset=${poolId}&address=${asset_address}&withdraw_bps=${bps}`,
-  )
-
-  if (!quoteData || 'error' in quoteData)
-    return Err(`Error fetching THORChain savers quote: ${quoteData?.error}`)
-
-  return Ok(quoteData)
-}
-
-export const getMidgardPools = async (
-  period?: MidgardPoolPeriod,
-): Promise<MidgardPoolResponse[]> => {
-  const maybePeriodQueryParameter: MidgardPoolRequest = period ? { period } : {}
-  const { data: poolsData } = await axios.get<MidgardPoolResponse[]>(
-    `${getConfig().VITE_THORCHAIN_MIDGARD_URL}/pools`,
-    { params: maybePeriodQueryParameter },
-  )
-
-  if (!poolsData) return []
-
-  return poolsData
-}
-
-export const isAboveDepositDustThreshold = ({
-  valueCryptoBaseUnit,
-  assetId,
-}: {
-  valueCryptoBaseUnit: BigNumber.Value | null | undefined
-  assetId: AssetId
-}) => bnOrZero(valueCryptoBaseUnit).gte(THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[assetId])
-
-export const getWithdrawBps = ({
-  withdrawAmountCryptoBaseUnit,
-  stakedAmountCryptoBaseUnit,
-  rewardsAmountCryptoBaseUnit,
-}: {
-  withdrawAmountCryptoBaseUnit: BigNumber.Value
-  stakedAmountCryptoBaseUnit: BigNumber.Value
-  rewardsAmountCryptoBaseUnit: BigNumber.Value
-}) => {
-  const stakedAmountCryptoBaseUnitIncludeRewards = bnOrZero(stakedAmountCryptoBaseUnit).plus(
-    rewardsAmountCryptoBaseUnit,
-  )
-
-  const withdrawRatio = bnOrZero(withdrawAmountCryptoBaseUnit).div(
-    stakedAmountCryptoBaseUnitIncludeRewards,
-  )
-
-  const withdrawBps = withdrawRatio.times(BASE_BPS_POINTS).toFixed(0)
-
-  return withdrawBps
-}
-
-export const isSupportedThorchainSaversAssetId = (assetId: AssetId) =>
-  SUPPORTED_THORCHAIN_SAVERS_ASSET_IDS.includes(assetId)
-export const isSupportedThorchainSaversChainId = (chainId: ChainId) =>
-  SUPPORTED_THORCHAIN_SAVERS_CHAIN_IDS.includes(chainId)
-
-export const makeDaysToBreakEven = ({
-  expectedAmountOutThorBaseUnit,
-  amountCryptoBaseUnit,
-  asset,
-  apy,
-}: {
-  expectedAmountOutThorBaseUnit: string
-  amountCryptoBaseUnit: BigNumber.Value
-  asset: Asset
-  apy: string
-}) => {
-  const amountCryptoThorBaseUnit = toThorBaseUnit({
-    valueCryptoBaseUnit: amountCryptoBaseUnit,
-    asset,
-  })
-  // The total downside that goes into a savers deposit, from THOR docs;
-  // "the minimum amount of the target asset the user can expect to deposit after fees"
-  // https://api.thorchain.shapeshift.com/lcd/thorchain/doc
-  const depositFeeCryptoPrecision = bnOrZero(
-    fromThorBaseUnit(amountCryptoThorBaseUnit.minus(expectedAmountOutThorBaseUnit)),
-  )
-  // Daily upside
-  const dailyEarnAmount = bnOrZero(fromThorBaseUnit(expectedAmountOutThorBaseUnit))
-    .times(apy)
-    .div(365)
-
-  const daysToBreakEvenOrZero = bnOrZero(1)
-    .div(dailyEarnAmount.div(depositFeeCryptoPrecision))
-    .toFixed()
-  // If daysToBreakEvenOrZero is a fraction of 1, the daily upside is effectively higher than the fees
-  // meaning the user will break even in a timeframe between the first rewards accrual (e.g next THOR block after deposit is confirmed)
-  // and ~ a day after deposit
-  const daysToBreakEven = BigNumber.max(daysToBreakEvenOrZero, 1).toFixed(0)
-  return daysToBreakEven
-}
diff --git a/src/state/slices/opportunitiesSlice/types.ts b/src/state/slices/opportunitiesSlice/types.ts
index 3f5219d48fe..9ce034a78ef 100644
--- a/src/state/slices/opportunitiesSlice/types.ts
+++ b/src/state/slices/opportunitiesSlice/types.ts
@@ -2,7 +2,6 @@ import type { AccountId, AssetId, ChainId } from '@shapeshiftoss/caip'
 import type { PartialRecord } from '@shapeshiftoss/types'
 
 import type { CosmosSdkStakingSpecificUserStakingOpportunity } from './resolvers/cosmosSdk/types'
-import type { ThorchainSaversStakingSpecificMetadata } from './resolvers/thorchainsavers/types'
 import type {
   OpportunitiesMetadataResolverInput,
   OpportunitiesUserDataResolverInput,
@@ -22,7 +21,7 @@ export enum DefiProvider {
   rFOX = 'rFOX',
   EthFoxStaking = 'ETH/FOX Staking',
   CosmosSdk = 'Cosmos SDK',
-  ThorchainSavers = 'THORChain Savers',
+  RunePool = 'RUNEPool',
 }
 
 export type DefiProviderMetadata = {
@@ -80,7 +79,7 @@ export type OpportunityMetadataBase = {
   tags?: string[]
 }
 
-export type OpportunityMetadata = OpportunityMetadataBase | ThorchainSaversStakingSpecificMetadata
+export type OpportunityMetadata = OpportunityMetadataBase
 
 // User-specific values for this opportunity
 export type UserStakingOpportunityBase = {
@@ -99,13 +98,13 @@ export type UserStakingOpportunityBase = {
   }
 }
 
-export type SaversUserStakingOpportunity = {
+export type RunePoolUserStakingOpportunity = {
   dateUnlocked: number
 } & UserStakingOpportunityBase
 
 export type UserStakingOpportunity =
   | UserStakingOpportunityBase
-  | SaversUserStakingOpportunity
+  | RunePoolUserStakingOpportunity
   | CosmosSdkStakingSpecificUserStakingOpportunity
 
 export type UserStakingOpportunityWithMetadata = UserStakingOpportunity & OpportunityMetadata
diff --git a/src/state/slices/opportunitiesSlice/utils/index.ts b/src/state/slices/opportunitiesSlice/utils/index.ts
index 1c44654b8a0..31e3b8a1711 100644
--- a/src/state/slices/opportunitiesSlice/utils/index.ts
+++ b/src/state/slices/opportunitiesSlice/utils/index.ts
@@ -11,7 +11,7 @@ import type {
 import type {
   OpportunityId,
   OpportunityMetadataBase,
-  SaversUserStakingOpportunity,
+  RunePoolUserStakingOpportunity,
   StakingEarnOpportunityType,
   StakingId,
   UserStakingId,
@@ -50,7 +50,7 @@ export const filterUserStakingIdByStakingIdCompareFn = (
 }
 
 // An OpportunityId as an AssetId, i.e any chain where the opportunity is an Asset
-// That may be a L1 AssetId (THOR savers), or a smart contract account, which for all intent and purposes is an ERC20 i.e an asset
+// That may be a L1 AssetId (RUNEPool), or a smart contract account, which for all intent and purposes is an ERC20 i.e an asset
 export const toOpportunityId = (...[args]: Parameters<typeof toAssetId>) =>
   toAssetId(args) as OpportunityId
 
@@ -199,8 +199,8 @@ export const getOpportunityAccessor: GetOpportunityAccessor = ({ provider, type
   return 'underlyingAssetIds'
 }
 
-export const isSaversUserStakingOpportunity = (
+export const isRunePoolUserStakingOpportunity = (
   opportunity: StakingEarnOpportunityType | undefined,
-): opportunity is StakingEarnOpportunityType & SaversUserStakingOpportunity => {
-  return Boolean(opportunity && opportunity.provider === DefiProvider.ThorchainSavers)
+): opportunity is StakingEarnOpportunityType & RunePoolUserStakingOpportunity => {
+  return Boolean(opportunity && opportunity.provider === DefiProvider.RunePool)
 }
diff --git a/src/state/slices/preferencesSlice/preferencesSlice.ts b/src/state/slices/preferencesSlice/preferencesSlice.ts
index fdd2c2899ab..98578e786ba 100644
--- a/src/state/slices/preferencesSlice/preferencesSlice.ts
+++ b/src/state/slices/preferencesSlice/preferencesSlice.ts
@@ -64,9 +64,6 @@ export type FeatureFlags = {
   ThorSwap: boolean
   WalletConnectToDapps: boolean
   WalletConnectToDappsV2: boolean
-  SaversVaults: boolean
-  SaversVaultsDeposit: boolean
-  SaversVaultsWithdraw: boolean
   Cowswap: boolean
   ZrxSwap: boolean
   Mixpanel: boolean
@@ -79,9 +76,6 @@ export type FeatureFlags = {
   WalletConnectV2: boolean
   WcDirectConnection: boolean
   CustomSendNonce: boolean
-  ThorchainLending: boolean
-  ThorchainLendingBorrow: boolean
-  ThorchainLendingRepay: boolean
   ThorchainLP: boolean
   ThorchainLpDeposit: boolean
   ThorchainLpWithdraw: boolean
@@ -238,9 +232,6 @@ const initialState: Preferences = {
     ThorSwap: getConfig().VITE_FEATURE_THOR_SWAP,
     WalletConnectToDappsV2: getConfig().VITE_FEATURE_WALLET_CONNECT_TO_DAPPS_V2,
     WalletConnectToDapps: getConfig().VITE_FEATURE_WALLET_CONNECT_TO_DAPPS,
-    SaversVaults: getConfig().VITE_FEATURE_SAVERS_VAULTS,
-    SaversVaultsDeposit: getConfig().VITE_FEATURE_SAVERS_VAULTS_DEPOSIT,
-    SaversVaultsWithdraw: getConfig().VITE_FEATURE_SAVERS_VAULTS_WITHDRAW,
     Cowswap: getConfig().VITE_FEATURE_COWSWAP,
     ZrxSwap: getConfig().VITE_FEATURE_ZRX_SWAP,
     Mixpanel: getConfig().VITE_FEATURE_MIXPANEL,
@@ -253,9 +244,6 @@ const initialState: Preferences = {
     WalletConnectV2: getConfig().VITE_FEATURE_WALLET_CONNECT_V2,
     WcDirectConnection: getConfig().VITE_FEATURE_WC_DIRECT_CONNECTION,
     CustomSendNonce: getConfig().VITE_EXPERIMENTAL_CUSTOM_SEND_NONCE,
-    ThorchainLending: getConfig().VITE_FEATURE_THORCHAIN_LENDING,
-    ThorchainLendingBorrow: getConfig().VITE_FEATURE_THORCHAIN_LENDING_BORROW,
-    ThorchainLendingRepay: getConfig().VITE_FEATURE_THORCHAIN_LENDING_REPAY,
     ThorchainLP: getConfig().VITE_FEATURE_THORCHAIN_LP,
     ThorchainLpDeposit: getConfig().VITE_FEATURE_THORCHAIN_LP_DEPOSIT,
     ThorchainLpWithdraw: getConfig().VITE_FEATURE_THORCHAIN_LP_WITHDRAW,
diff --git a/src/test/mocks/store.ts b/src/test/mocks/store.ts
index 783e0d0ee34..193d7b80e7b 100644
--- a/src/test/mocks/store.ts
+++ b/src/test/mocks/store.ts
@@ -138,9 +138,6 @@ export const mockStore: ReduxState = {
       Cowswap: false,
       WalletConnectToDapps: false,
       WalletConnectToDappsV2: false,
-      SaversVaults: false,
-      SaversVaultsDeposit: false,
-      SaversVaultsWithdraw: false,
       Mixpanel: false,
       DynamicLpAssets: false,
       ReadOnlyAssets: false,
@@ -149,9 +146,6 @@ export const mockStore: ReduxState = {
       WalletConnectV2: false,
       WcDirectConnection: false,
       CustomSendNonce: false,
-      ThorchainLending: false,
-      ThorchainLendingBorrow: false,
-      ThorchainLendingRepay: false,
       ThorchainLP: false,
       ThorchainLpDeposit: false,
       ThorchainLpWithdraw: false,
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 6d9e156f17c..dc59e8ac170 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -12,9 +12,6 @@ interface ImportMetaEnv {
   readonly VITE_FEATURE_ZCASH: string
   readonly VITE_FEATURE_MIXPANEL: string
   readonly VITE_ENABLE_HYPELAB: string
-  readonly VITE_FEATURE_SAVERS_VAULTS: string
-  readonly VITE_FEATURE_SAVERS_VAULTS_DEPOSIT: string
-  readonly VITE_FEATURE_SAVERS_VAULTS_WITHDRAW: string
   readonly VITE_FEATURE_WALLET_CONNECT_TO_DAPPS_V2: string
   readonly VITE_FEATURE_WALLET_CONNECT_TO_DAPPS: string
   readonly VITE_FEATURE_CHATWOOT: string
@@ -22,9 +19,6 @@ interface ImportMetaEnv {
   readonly VITE_FEATURE_LEDGER_WALLET: string
   readonly VITE_FEATURE_VULTISIG_WALLET: string
   readonly VITE_FEATURE_WALLET_CONNECT_V2: string
-  readonly VITE_FEATURE_THORCHAIN_LENDING: string
-  readonly VITE_FEATURE_THORCHAIN_LENDING_BORROW: string
-  readonly VITE_FEATURE_THORCHAIN_LENDING_REPAY: string
   readonly VITE_FEATURE_THORCHAINSWAP_LONGTAIL: string
   readonly VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL: string
   readonly VITE_FEATURE_THORCHAIN_LP: string