From 195e164865d45d8ed9021d317c8096c217527862 Mon Sep 17 00:00:00 2001
From: Christine Pinto <chrissie2788@gmail.com>
Date: Fri, 19 Apr 2024 08:56:21 +0200
Subject: [PATCH 1/6] [ENG-4133] Add "switch to testnet and back to mainnet"
 flow(#206)

[ENG-4132]Add data-testid to network address input fields
---
 .../settings/changeNetwork/nodeInput.tsx      |  2 +-
 tests/pages/startPage.ts                      | 86 +++++++++++++++++++
 tests/specs/onboarding.spec.ts                | 10 +++
 3 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/src/app/screens/settings/changeNetwork/nodeInput.tsx b/src/app/screens/settings/changeNetwork/nodeInput.tsx
index f23992727..9520c2a74 100644
--- a/src/app/screens/settings/changeNetwork/nodeInput.tsx
+++ b/src/app/screens/settings/changeNetwork/nodeInput.tsx
@@ -77,7 +77,7 @@ function NodeInput({
         <NodeResetButton onClick={onReset}>{t('RESET_TO_DEFAULT')}</NodeResetButton>
       </NodeInputHeader>
       <InputContainer>
-        <Input onChange={onChange} value={value} />
+        <Input data-testid={label} onChange={onChange} value={value} />
         {value && (
           <Button onClick={onClear}>
             <XCircle size={18} weight="fill" color={theme.colors.white_200} />
diff --git a/tests/pages/startPage.ts b/tests/pages/startPage.ts
index 363f37a89..4af0f8b2e 100644
--- a/tests/pages/startPage.ts
+++ b/tests/pages/startPage.ts
@@ -23,6 +23,22 @@ export default class StartPage {
 
   readonly buttonConfirmCopyAddress: Locator;
 
+  readonly buttonNetwork: Locator;
+
+  readonly buttonSave: Locator;
+
+  readonly buttonMainnet: Locator;
+
+  readonly buttonTestnet: Locator;
+
+  readonly buttonBack: Locator;
+
+  readonly inputStacksURL: Locator;
+
+  readonly inputBTCURL: Locator;
+
+  readonly inputFallbackBTCURL: Locator;
+
   constructor(readonly page: Page) {
     this.page = page;
     this.balance = page.getByTestId('total-balance-value');
@@ -41,6 +57,15 @@ export default class StartPage {
     );
 
     this.buttonConfirmCopyAddress = page.getByRole('button', { name: 'I understand' });
+
+    this.buttonNetwork = page.getByRole('button', { name: 'Network' });
+    this.buttonSave = page.getByRole('button', { name: 'Save' });
+    this.buttonMainnet = page.getByRole('button', { name: 'Mainnet' });
+    this.buttonTestnet = page.getByRole('button', { name: 'Testnet' });
+    this.buttonBack = page.getByRole('button', { name: 'back button' });
+    this.inputStacksURL = page.getByTestId('Stacks URL');
+    this.inputBTCURL = page.getByTestId('BTC URL');
+    this.inputFallbackBTCURL = page.getByTestId('Fallback BTC URL');
   }
 
   async checkVisuals() {
@@ -65,4 +90,65 @@ export default class StartPage {
     const address = await this.page.evaluate('navigator.clipboard.readText()');
     return address;
   }
+
+  async checkNetworkSettingVisuals() {
+    await expect(this.buttonSave).toBeVisible();
+    await expect(this.buttonBack).toBeVisible();
+    await expect(this.buttonMainnet).toBeVisible();
+    await expect(this.buttonTestnet).toBeVisible();
+    await expect(this.inputStacksURL).toBeVisible();
+    await expect(this.inputBTCURL).toBeVisible();
+    await expect(this.inputFallbackBTCURL).toBeVisible();
+  }
+
+  async checkTestnetUrls(shouldContainTestnet) {
+    const inputsURL = [this.inputStacksURL, this.inputBTCURL, this.inputFallbackBTCURL];
+    const checks = inputsURL.map(async (input) => {
+      const inputValue = await input.inputValue();
+      const message = `URL does not contain 'testnet' in ${input}`;
+      if (shouldContainTestnet) {
+        return expect(inputValue, message).toContain('testnet');
+      }
+      return expect(inputValue, message).not.toContain('testnet');
+    });
+    await Promise.all(checks);
+  }
+
+  async switchtoTestnetNetwork() {
+    await expect(this.buttonNetwork).toBeVisible();
+    await expect(this.buttonNetwork).toHaveText('NetworkMainnet');
+    await this.buttonNetwork.click();
+    await this.checkNetworkSettingVisuals();
+    await expect(this.buttonMainnet.locator('img')).toHaveAttribute('alt', 'tick');
+    await expect(this.buttonTestnet.locator('img[alt="tick"]')).toHaveCount(0);
+
+    await this.buttonTestnet.click();
+    await expect(this.buttonTestnet.locator('img')).toHaveAttribute('alt', 'tick');
+    await expect(this.buttonMainnet.locator('img[alt="tick"]')).toHaveCount(0);
+
+    await this.checkTestnetUrls(true);
+
+    await this.buttonSave.click();
+    await expect(this.buttonNetwork).toBeVisible();
+    await expect(this.buttonNetwork).toHaveText('NetworkTestnet');
+  }
+
+  async switchtoMainnetNetwork() {
+    await expect(this.buttonNetwork).toBeVisible();
+    await expect(this.buttonNetwork).toHaveText('NetworkTestnet');
+    await this.buttonNetwork.click();
+    await this.checkNetworkSettingVisuals();
+    await expect(this.buttonTestnet.locator('img')).toHaveAttribute('alt', 'tick');
+    await expect(this.buttonMainnet.locator('img[alt="tick"]')).toHaveCount(0);
+
+    await this.buttonMainnet.click();
+    await expect(this.buttonMainnet.locator('img')).toHaveAttribute('alt', 'tick');
+    await expect(this.buttonTestnet.locator('img[alt="tick"]')).toHaveCount(0);
+
+    await this.checkTestnetUrls(false);
+
+    await this.buttonSave.click();
+    await expect(this.buttonNetwork).toBeVisible();
+    await expect(this.buttonNetwork).toHaveText('NetworkMainnet');
+  }
 }
diff --git a/tests/specs/onboarding.spec.ts b/tests/specs/onboarding.spec.ts
index dbe00edfe..a643abddc 100644
--- a/tests/specs/onboarding.spec.ts
+++ b/tests/specs/onboarding.spec.ts
@@ -201,4 +201,14 @@ test.describe('onboarding flow', () => {
     await onboardingpage.buttonUnlock.click();
     await startpage.checkVisuals();
   });
+
+  test('switch to testnet and back to mainnet', async ({ page, extensionId }) => {
+    const onboardingpage = new Onboarding(page);
+    const startpage = new StartPage(page);
+    await onboardingpage.createWalletSkipBackup(strongPW);
+    await page.goto(`chrome-extension://${extensionId}/popup.html#/settings`);
+
+    await startpage.switchtoTestnetNetwork();
+    await startpage.switchtoMainnetNetwork();
+  });
 });

From 364caf14cea43d50d973f74ca1bb50fa18ed0ef1 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 22 Apr 2024 10:27:58 +0000
Subject: [PATCH 2/6] release: v0.34.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2af757ff..9098aaf24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.34.0",
+      "version": "0.34.1",
       "dependencies": {
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
         "@phosphor-icons/react": "^2.0.10",
diff --git a/package.json b/package.json
index 4eeb83f78..b9f930fce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 9cdb407fbaf872c4c6cd38a725fa0cbcc509dbab Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 23 Apr 2024 08:39:00 +0300
Subject: [PATCH 3/6] Don't show rune burn label on partial transaction (#208)

* Don't show rune burn label on partial transaction

* chore: add runes delegation section

* fix: minor animation and icon fixes

---------

Co-authored-by: fede erbes <fedeerbes@gmail.com>
Co-authored-by: Tim Man <tim@secretkeylabs.com>
---
 .../confirmBtcTransaction/delegateSection.tsx | 110 ++++++++++++++++++
 .../transactionSummary.tsx                    |   6 +-
 .../screens/signBatchPsbtRequest/index.tsx    |  17 ++-
 src/locales/en.json                           |   5 +-
 4 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 src/app/components/confirmBtcTransaction/delegateSection.tsx

diff --git a/src/app/components/confirmBtcTransaction/delegateSection.tsx b/src/app/components/confirmBtcTransaction/delegateSection.tsx
new file mode 100644
index 000000000..605ac9405
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/delegateSection.tsx
@@ -0,0 +1,110 @@
+import DropDownIcon from '@assets/img/transactions/dropDownIcon.svg';
+import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
+import { WarningOctagon } from '@phosphor-icons/react';
+import { animated, config, useSpring } from '@react-spring/web';
+import { RuneSummary } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import Theme from 'theme';
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  background: props.theme.colors.elevation1,
+  borderRadius: 12,
+  padding: `${props.theme.space.m} 0`,
+  justifyContent: 'center',
+  marginBottom: props.theme.space.s,
+}));
+
+const RowContainer = styled.div((props) => ({
+  padding: `0 ${props.theme.space.m}`,
+  marginTop: `${props.theme.space.m}`,
+}));
+
+const RowCenter = styled.div<{ spaceBetween?: boolean }>((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  justifyContent: props.spaceBetween ? 'space-between' : 'initial',
+}));
+
+const Header = styled(RowCenter)((props) => ({
+  padding: `0 ${props.theme.space.m}`,
+}));
+
+const WarningButton = styled.button`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  background-color: ${(props) => props.theme.colors.elevation1};
+  padding: ${(props) => props.theme.space.m};
+  padding-bottom: 0;
+`;
+
+const DelegationDescription = styled(StyledP)`
+  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
+  padding-bottom: ${(props) => props.theme.space.xs};
+`;
+
+const Title = styled(StyledP)`
+  margin-left: ${(props) => props.theme.space.xxs};
+`;
+
+type Props = {
+  delegations?: RuneSummary['burns'];
+};
+
+function DelegateSection({ delegations }: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+
+  const [showDelegationInfo, setShowDelegationInfo] = useState(false);
+
+  const slideInStyles = useSpring({
+    config: { ...config.gentle, duration: 200 },
+    from: { opacity: 0, maxHeight: 0 },
+    to: { opacity: 1, maxHeight: 100 },
+    reverse: !showDelegationInfo,
+  });
+
+  const arrowRotation = useSpring({
+    transform: showDelegationInfo ? 'rotate(180deg)' : 'rotate(0deg)',
+    config: { ...config.stiff },
+  });
+
+  if (!delegations?.length) return null;
+
+  return (
+    <Container>
+      <Header>
+        <StyledP typography="body_medium_m" color="white_200">
+          {t('YOU_WILL_DELEGATE')}
+        </StyledP>
+      </Header>
+      {delegations.map((delegation) => (
+        <RowContainer key={delegation.runeName}>
+          <RuneAmount tokenName={delegation.runeName} amount={String(delegation.amount)} />
+        </RowContainer>
+      ))}
+      <WarningButton type="button" onClick={() => setShowDelegationInfo((prevState) => !prevState)}>
+        <RowCenter>
+          <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
+          <Title typography="body_medium_s" color="caution">
+            {t('UNKNOWN_RUNE_RECIPIENTS')}
+          </Title>
+        </RowCenter>
+        <animated.img style={arrowRotation} src={DropDownIcon} alt="Drop Down" />
+      </WarningButton>
+      <animated.div style={slideInStyles}>
+        <DelegationDescription typography="body_medium_s" color="white_200">
+          {t('RUNE_DELEGATION_DESCRIPTION')}
+        </DelegationDescription>
+      </animated.div>
+    </Container>
+  );
+}
+
+export default DelegateSection;
diff --git a/src/app/components/confirmBtcTransaction/transactionSummary.tsx b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
index 146f7956e..20604d20c 100644
--- a/src/app/components/confirmBtcTransaction/transactionSummary.tsx
+++ b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
@@ -14,6 +14,7 @@ import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
+import DelegateSection from './delegateSection';
 import AmountWithInscriptionSatribute from './itemRow/amountWithInscriptionSatribute';
 import ReceiveSection from './receiveSection';
 import TransferSection from './transferSection';
@@ -100,6 +101,8 @@ function TransactionSummary({
 
   const showFeeSelector = !!(feeRate && getFeeForFeeRate && onFeeRateSet);
 
+  const hasRuneDelegation = (runeSummary?.burns.length ?? 0) > 0 && isPartialTransaction;
+
   return (
     <>
       {inscriptionToShow && (
@@ -130,6 +133,7 @@ function TransactionSummary({
       {runeSummary?.mint && !runeSummary?.mint?.runeIsMintable && (
         <WarningCallout bodyText={t('RUNE_IS_CLOSED')} variant="danger" />
       )}
+      {hasRuneDelegation && <DelegateSection delegations={runeSummary?.burns} />}
       <TransferSection
         outputs={outputs}
         inputs={inputs}
@@ -144,7 +148,7 @@ function TransactionSummary({
         netAmount={netAmount}
         runeReceipts={runeSummary?.receipts}
       />
-      <BurnSection burns={runeSummary?.burns} />
+      {!hasRuneDelegation && <BurnSection burns={runeSummary?.burns} />}
       <MintSection mints={[runeSummary?.mint]} />
       <TxInOutput inputs={inputs} outputs={outputs} />
       {hasOutputScript && !runeSummary && <WarningCallout bodyText={t('SCRIPT_OUTPUT_TX')} />}
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index e578b6fa8..e71c72fdf 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -5,6 +5,7 @@ import AssetModal from '@components/assetModal';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import BurnSection from '@components/confirmBtcTransaction/burnSection';
+import DelegateSection from '@components/confirmBtcTransaction/delegateSection';
 import MintSection from '@components/confirmBtcTransaction/mintSection';
 import ReceiveSection from '@components/confirmBtcTransaction/receiveSection';
 import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
@@ -14,7 +15,6 @@ import InfoContainer from '@components/infoContainer';
 import LoadingTransactionStatus from '@components/loadingTransactionStatus';
 import { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
 import TransactionDetailComponent from '@components/transactionDetailComponent';
-import useBtcClient from '@hooks/useBtcClient';
 import useHasFeature from '@hooks/useHasFeature';
 import useSignBatchPsbtTx from '@hooks/useSignBatchPsbtTx';
 import useTransactionContext from '@hooks/useTransactionContext';
@@ -71,6 +71,10 @@ const TransparentButtonContainer = styled.div((props) => ({
   width: '100%',
 }));
 
+const WarningCallout = styled(Callout)`
+  margin-bottom: ${(props) => props.theme.space.m};
+`;
+
 const ReviewTransactionText = styled.h1((props) => ({
   ...props.theme.headline_s,
   color: props.theme.colors.white_0,
@@ -334,6 +338,10 @@ function SignBatchPsbtRequest() {
     );
   }
 
+  const isPartialTransaction = parsedPsbts.some((psbt) => !psbt.summary.feeOutput);
+  const runeBurns = parsedPsbts.map((psbt) => psbt.runeSummary?.burns ?? []).flat();
+  const hasSomeRuneDelegation = (runeBurns.length ?? 0) > 0 && isPartialTransaction;
+
   return (
     <>
       <AccountHeaderComponent disableMenuOption disableAccountSwitch />
@@ -367,6 +375,7 @@ function SignBatchPsbtRequest() {
                     }}
                   />
                 )}
+                {hasSomeRuneDelegation && <DelegateSection delegations={runeBurns} />}
                 <TransferSection
                   inputs={parsedPsbts.map((psbt) => psbt.summary.inputs).flat()}
                   outputs={parsedPsbts.map((psbt) => psbt.summary.outputs).flat()}
@@ -374,7 +383,7 @@ function SignBatchPsbtRequest() {
                     .map((psbt) => psbt.runeSummary?.transfers ?? [])
                     .flat()}
                   netAmount={(totalNetAmount.toNumber() + totalFeeAmount.toNumber()) * -1}
-                  isPartialTransaction={parsedPsbts.some((psbt) => !psbt.summary.feeOutput)}
+                  isPartialTransaction={isPartialTransaction}
                   onShowInscription={setInscriptionToShow}
                 />
                 <ReceiveSection
@@ -383,9 +392,7 @@ function SignBatchPsbtRequest() {
                   onShowInscription={setInscriptionToShow}
                   netAmount={totalNetAmount.toNumber()}
                 />
-                <BurnSection
-                  burns={parsedPsbts.map((psbt) => psbt.runeSummary?.burns ?? []).flat()}
-                />
+                {!isPartialTransaction && <BurnSection burns={runeBurns} />}
                 <MintSection mints={parsedPsbts.map((psbt) => psbt.runeSummary?.mint)} />
                 <TransactionDetailComponent title={t('NETWORK')} value={network.type} />
                 {hasOutputScript && !parsedPsbts.some((psbt) => psbt.runeSummary !== undefined) && (
diff --git a/src/locales/en.json b/src/locales/en.json
index dc6853704..46661fbf5 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -415,7 +415,10 @@
     "UNCONFIRMED_UTXO_WARNING": "You are spending unconfirmed outputs in this transaction. This may lower the effective fee rate causing delays in transaction confirmation",
     "INSCRIBED_RARE_SATS_WARNING": "Your payment wallet holds rare or inscribed sats. To avoid spending them in your transactions and fees, transfer them to your ordinals wallet",
     "RUNE_TERM_ENDED": "This rune has passed its mint term and can no longer be minted.",
-    "RUNE_IS_CLOSED": "This rune is closed and cannot be minted."
+    "RUNE_IS_CLOSED": "This rune is closed and cannot be minted.",
+    "UNKNOWN_RUNE_RECIPIENTS": "Undetermined Runes recipients ",
+    "RUNE_DELEGATION_DESCRIPTION": "This is a partial transaction with undetermined Runes recipients. You are delegating your Runes to the requesting app. The requesting app can burn your runes or transfer them to any recipient",
+    "YOU_WILL_DELEGATE": "You will delegate"
   },
   "TX_ERRORS": {
     "INSUFFICIENT_BALANCE": "The requested transaction cannot be created due to insufficient balance",

From 59de2a2df6f6d6cac90f6cc4f972c5c7304ef460 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 23 Apr 2024 12:38:16 +0300
Subject: [PATCH 4/6] Add Rune recovery screen (#214)

* Add rune recovery flow

* Fix minor bug and add logo

* Clean up and make fee rate configurable

* Fix runes receipt display

* chore: add review tx before confirming recover runes (#216)

* chore: add review tx before confirming recover runes

* chore: update description text

* address comments

* touchup based on new requirements

* chore: move away from restore and use recover

* fix ordering and invert state variable

* chore: move away from restore and use recover

* remove unnecessary function

* fix error message not mapped properly and touchup

* fix: wrong tab selection in recover assets flow

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>

---------

Co-authored-by: fede erbes <fedeerbes@gmail.com>
Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 .../confirmBtcTransaction/index.tsx           |   9 +-
 .../confirmBtcTransaction/receiveSection.tsx  |   6 +-
 src/app/routes/index.tsx                      |   5 +
 src/app/screens/restoreFunds/fundsRow.tsx     |  11 +-
 src/app/screens/restoreFunds/index.tsx        |  18 +-
 .../restoreFunds/recoverRunes/index.tsx       | 222 ++++++++++++++++++
 .../restoreFunds/restoreOrdinals/index.tsx    |   4 +-
 src/app/screens/settings/index.tsx            |  14 +-
 src/assets/img/nftDashboard/rune_icon.svg     |   1 +
 src/locales/en.json                           |  19 +-
 10 files changed, 286 insertions(+), 23 deletions(-)
 create mode 100644 src/app/screens/restoreFunds/recoverRunes/index.tsx
 create mode 100644 src/assets/img/nftDashboard/rune_icon.svg

diff --git a/src/app/components/confirmBtcTransaction/index.tsx b/src/app/components/confirmBtcTransaction/index.tsx
index 7e3f03ab6..662feb83c 100644
--- a/src/app/components/confirmBtcTransaction/index.tsx
+++ b/src/app/components/confirmBtcTransaction/index.tsx
@@ -1,6 +1,7 @@
 import { delay } from '@common/utils/ledger';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
+import { Tab } from '@components/tabBar';
 import useWalletSelector from '@hooks/useWalletSelector';
 import TransportFactory from '@ledgerhq/hw-transport-webusb';
 import { RuneSummary, Transport, btcTransaction } from '@secretkeylabs/xverse-core';
@@ -66,6 +67,8 @@ type Props = {
   onFeeRateSet?: (feeRate: number) => void;
   feeRate?: number;
   hasSigHashNone?: boolean;
+  title?: string;
+  selectedBottomTab?: Tab;
 };
 
 function ConfirmBtcTransaction({
@@ -89,6 +92,8 @@ function ConfirmBtcTransaction({
   onFeeRateSet,
   feeRate,
   hasSigHashNone = false,
+  title,
+  selectedBottomTab,
 }: Props) {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
@@ -177,14 +182,14 @@ function ConfirmBtcTransaction({
   ) : (
     <>
       <SendLayout
-        selectedBottomTab="dashboard"
+        selectedBottomTab={selectedBottomTab ?? 'dashboard'}
         onClickBack={onBackClick}
         hideBackButton={hideBackButton}
         showAccountHeader={showAccountHeader}
         hideBottomBar={hideBottomBar}
       >
         <ReviewTransactionText typography="headline_s">
-          {t('REVIEW_TRANSACTION')}
+          {title || t('REVIEW_TRANSACTION')}
         </ReviewTransactionText>
         {hasSigHashNone && (
           <SpacedCallout
diff --git a/src/app/components/confirmBtcTransaction/receiveSection.tsx b/src/app/components/confirmBtcTransaction/receiveSection.tsx
index bb1db0ec3..a73fd2f52 100644
--- a/src/app/components/confirmBtcTransaction/receiveSection.tsx
+++ b/src/app/components/confirmBtcTransaction/receiveSection.tsx
@@ -56,12 +56,14 @@ function ReceiveSection({ outputs, netAmount, onShowInscription, runeReceipts }:
     ordinalsAddress,
   });
 
-  // if receiving runes from own addresses, hide it because it is change
+  // if receiving runes from own addresses, hide it because it is change, unless it swap addresses (recover runes)
   const filteredRuneReceipts =
     runeReceipts?.filter(
       (receipt) =>
         !receipt.sourceAddresses.some(
-          (address) => address === ordinalsAddress || address === btcAddress,
+          (address) =>
+            (address === ordinalsAddress && receipt.destinationAddress === ordinalsAddress) ||
+            (address === btcAddress && receipt.destinationAddress === btcAddress),
         ),
     ) ?? [];
   const ordinalRuneReceipts = filteredRuneReceipts.filter(
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index d60163308..a871566a8 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -47,6 +47,7 @@ import RareSatsBundle from '@screens/rareSatsBundle';
 import RareSatsDetailScreen from '@screens/rareSatsDetail/rareSatsDetail';
 import Receive from '@screens/receive';
 import RestoreFunds from '@screens/restoreFunds';
+import RecoverRunes from '@screens/restoreFunds/recoverRunes';
 import RestoreOrdinals from '@screens/restoreFunds/restoreOrdinals';
 import RestoreWallet from '@screens/restoreWallet';
 // import SendBrc20Screen from '@screens/sendBrc20';
@@ -340,6 +341,10 @@ const router = createHashRouter([
         path: 'restore-ordinals',
         element: <RestoreOrdinals />,
       },
+      {
+        path: 'recover-runes',
+        element: <RecoverRunes />,
+      },
       {
         path: 'fiat-currency',
         element: <FiatCurrencyScreen />,
diff --git a/src/app/screens/restoreFunds/fundsRow.tsx b/src/app/screens/restoreFunds/fundsRow.tsx
index 166f9ccf2..522ba104b 100644
--- a/src/app/screens/restoreFunds/fundsRow.tsx
+++ b/src/app/screens/restoreFunds/fundsRow.tsx
@@ -4,7 +4,6 @@ const Icon = styled.img((props) => ({
   marginRight: props.theme.spacing(8),
   width: 32,
   height: 32,
-  borderRadius: 30,
 }));
 
 const TitleText = styled.h1((props) => ({
@@ -34,6 +33,11 @@ const RowContainer = styled.button((props) => ({
   background: 'transparent',
   width: '100%',
   marginBottom: 12,
+  ':disabled': {
+    backgroundColor: props.theme.colors.elevation0,
+    opacity: 0.5,
+    cursor: 'not-allowed',
+  },
 }));
 
 interface Props {
@@ -41,11 +45,12 @@ interface Props {
   title: string;
   description: string;
   onClick: () => void;
+  disabled?: boolean;
 }
 
-function FundsRow({ image, title, description, onClick }: Props) {
+function FundsRow({ image, title, description, onClick, disabled }: Props) {
   return (
-    <RowContainer onClick={onClick}>
+    <RowContainer onClick={onClick} disabled={disabled}>
       <Icon src={image} />
       <Container>
         <TitleText>{title}</TitleText>
diff --git a/src/app/screens/restoreFunds/index.tsx b/src/app/screens/restoreFunds/index.tsx
index 079bbbc41..50d885a49 100644
--- a/src/app/screens/restoreFunds/index.tsx
+++ b/src/app/screens/restoreFunds/index.tsx
@@ -1,13 +1,15 @@
 import OrdinalsIcon from '@assets/img/nftDashboard/ordinals_icon.svg';
+import RuneIcon from '@assets/img/nftDashboard/rune_icon.svg';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 import FundsRow from './fundsRow';
 
 const RestoreFundTitle = styled.h1((props) => ({
-  ...props.theme.body_l,
+  ...props.theme.typography.body_l,
   marginBottom: 15,
   marginTop: 24,
   marginLeft: 16,
@@ -24,6 +26,7 @@ const Container = styled.div({
 
 function RestoreFunds() {
   const { t } = useTranslation('translation', { keyPrefix: 'RESTORE_FUND_SCREEN' });
+  const { hasActivatedOrdinalsKey } = useWalletSelector();
   const navigate = useNavigate();
 
   const handleOnCancelClick = () => {
@@ -34,6 +37,10 @@ function RestoreFunds() {
     navigate('/restore-ordinals');
   };
 
+  const onRecoverRunesClick = () => {
+    navigate('/recover-runes');
+  };
+
   return (
     <>
       <TopRow title={t('TITLE')} onClick={handleOnCancelClick} />
@@ -41,12 +48,19 @@ function RestoreFunds() {
       <Container>
         <FundsRow
           image={OrdinalsIcon}
+          disabled={!hasActivatedOrdinalsKey}
           title={t('RECOVER_ORDINALS')}
           description={t('RECOVER_ORDINALS_DESC')}
           onClick={handleOnRestoreOrdinalClick}
         />
+        <FundsRow
+          image={RuneIcon}
+          title={t('RECOVER_RUNES')}
+          description={t('RECOVER_RUNES_DESC')}
+          onClick={onRecoverRunesClick}
+        />
       </Container>
-      <BottomTabBar tab="nft" />
+      <BottomTabBar tab="settings" />
     </>
   );
 }
diff --git a/src/app/screens/restoreFunds/recoverRunes/index.tsx b/src/app/screens/restoreFunds/recoverRunes/index.tsx
new file mode 100644
index 000000000..4844bb58f
--- /dev/null
+++ b/src/app/screens/restoreFunds/recoverRunes/index.tsx
@@ -0,0 +1,222 @@
+import ConfirmBitcoinTransaction from '@components/confirmBtcTransaction';
+import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
+import BottomTabBar from '@components/tabBar';
+import TopRow from '@components/topRow';
+import useBtcFeeRate from '@hooks/useBtcFeeRate';
+import useTransactionContext from '@hooks/useTransactionContext';
+import { TransactionSummary } from '@screens/sendBtc/helpers';
+import { RuneSummary, parseSummaryForRunes, runesTransaction } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import { StyledP } from '@ui-library/common.styled';
+import Spinner from '@ui-library/spinner';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+
+const ScrollContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  ${(props) => props.theme.scrollbar}
+  padding: 0 ${(props) => props.theme.space.xs};
+`;
+
+const Description = styled(StyledP)`
+  text-align: left;
+  margin: 0 ${(props) => props.theme.space.m} ${(props) => props.theme.space.l}
+    ${(props) => props.theme.space.m};
+`;
+
+const RowContainer = styled.div((props) => ({
+  marginBottom: `${props.theme.space.s}`,
+  background: props.theme.colors.elevation1,
+  borderRadius: 12,
+  padding: `${props.theme.space.m} ${props.theme.space.s}`,
+}));
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flex: 1,
+  flexDirection: 'column',
+  marginTop: props.theme.space.xl,
+}));
+
+const LoaderContainer = styled.div({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  flex: 1,
+});
+
+const ButtonContainer = styled.div((props) => ({
+  marginBottom: props.theme.space.l,
+  display: 'flex',
+  alignItems: 'flex-end',
+  padding: `0 ${props.theme.space.m}`,
+}));
+
+// TODO: export this from core
+type EnhancedTransaction = Awaited<ReturnType<typeof runesTransaction.recoverRunes>>;
+
+function RecoverRunes() {
+  const { t } = useTranslation('translation', { keyPrefix: 'RECOVER_RUNES_SCREEN' });
+  const navigate = useNavigate();
+  const [error, setError] = useState('');
+  const [feeRate, setFeeRate] = useState('');
+  const [isLoading, setIsLoading] = useState(true);
+  const [isBroadcasting, setIsBroadcasting] = useState(false);
+  const [enhancedTxn, setEnhancedTxn] = useState<EnhancedTransaction>();
+  const [summary, setSummary] = useState<TransactionSummary>();
+  const [runeSummary, setRuneSummary] = useState<RuneSummary>();
+  const [isConfirmTx, setIsConfirmTx] = useState(false);
+
+  const { data: btcFeeRates } = useBtcFeeRate();
+  const context = useTransactionContext();
+
+  const generateTransactionAndSummary = async (desiredFeeRate: number) => {
+    const tx = await runesTransaction.recoverRunes(context, desiredFeeRate);
+    const txSummary = await tx.getSummary();
+    const txRuneSummary = await parseSummaryForRunes(context, txSummary, context.network);
+
+    return { transaction: tx, summary: txSummary, runeSummary: txRuneSummary };
+  };
+
+  useEffect(() => {
+    if (!btcFeeRates?.priority) return;
+
+    if (!feeRate) {
+      setFeeRate(btcFeeRates.priority.toString());
+      return;
+    }
+
+    const buildTx = async () => {
+      try {
+        const txDetails = await generateTransactionAndSummary(+feeRate);
+        setEnhancedTxn(txDetails.transaction);
+        setSummary(txDetails.summary);
+        setRuneSummary(txDetails.runeSummary);
+      } catch (e) {
+        setEnhancedTxn(undefined);
+        setSummary(undefined);
+        if (e instanceof Error) {
+          if (e.message === 'No runes to recover') {
+            setError(t('NO_RUNES'));
+            return;
+          }
+          if (e.message.includes('Insufficient funds')) {
+            setError(t('INSUFFICIENT_FUNDS'));
+            return;
+          }
+        }
+        setError((e as Error).message);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    buildTx();
+  }, [context, btcFeeRates, feeRate, t]);
+
+  const calculateFeeForFeeRate = async (desiredFeeRate: number): Promise<number | undefined> => {
+    const { summary: tempSummary } = await generateTransactionAndSummary(desiredFeeRate);
+    if (tempSummary) return Number(tempSummary.fee);
+
+    return undefined;
+  };
+
+  const handleToggleConfirmTx = () => setIsConfirmTx(!isConfirmTx);
+  const handleOnNavigateBack = () => navigate(-1);
+
+  const onClickTransfer = async () => {
+    setIsBroadcasting(true);
+    try {
+      const txnId = await enhancedTxn?.broadcast();
+      navigate('/tx-status', {
+        state: {
+          txid: txnId,
+          currency: 'BTC',
+          error: '',
+        },
+      });
+    } catch (e) {
+      setError((e as Error).message);
+    } finally {
+      setIsBroadcasting(false);
+    }
+  };
+
+  if (!error && !isLoading) {
+    return !isConfirmTx ? (
+      <>
+        <TopRow title={t('TITLE')} onClick={handleOnNavigateBack} />
+        <Description typography="body_m" color="white_200">
+          {t('DESCRIPTION')}
+        </Description>
+        <ScrollContainer>
+          {(runeSummary?.transfers ?? []).map((transfer) => (
+            <RowContainer key={transfer.runeName}>
+              <RuneAmount
+                tokenName={transfer.runeName}
+                amount={String(transfer.amount)}
+                divisibility={transfer.divisibility}
+                hasSufficientBalance={transfer.hasSufficientBalance}
+              />
+            </RowContainer>
+          ))}
+        </ScrollContainer>
+        <ButtonContainer>
+          <Button title={t('TRANSFER_ALL')} onClick={handleToggleConfirmTx} />
+        </ButtonContainer>
+        <BottomTabBar tab="settings" />
+      </>
+    ) : (
+      <ConfirmBitcoinTransaction
+        title={t('TITLE')}
+        inputs={summary?.inputs ?? []}
+        outputs={summary?.outputs ?? []}
+        feeOutput={summary?.feeOutput}
+        runeSummary={runeSummary}
+        isLoading={isLoading}
+        isSubmitting={isBroadcasting}
+        confirmText={t('CONFIRM')}
+        cancelText={t('BACK')}
+        onCancel={handleToggleConfirmTx}
+        onConfirm={onClickTransfer}
+        getFeeForFeeRate={calculateFeeForFeeRate}
+        onFeeRateSet={(newFeeRate) => setFeeRate(newFeeRate.toString())}
+        feeRate={+feeRate}
+        isError={!!error}
+        hideBottomBar={false}
+        selectedBottomTab="settings"
+        showAccountHeader={false}
+        isBroadcast
+        onBackClick={handleToggleConfirmTx}
+      />
+    );
+  }
+  return (
+    <>
+      <TopRow title={t('TITLE')} onClick={handleOnNavigateBack} />
+      <Container>
+        {isLoading ? (
+          <LoaderContainer>
+            <Spinner color="white" size={25} />
+          </LoaderContainer>
+        ) : (
+          <Description typography="body_l" color="white_200">
+            {error}
+          </Description>
+        )}
+      </Container>
+      {!isLoading && (
+        <ButtonContainer>
+          <Button title={t('BACK')} onClick={handleOnNavigateBack} />
+        </ButtonContainer>
+      )}
+      <BottomTabBar tab="settings" />
+    </>
+  );
+}
+
+export default RecoverRunes;
diff --git a/src/app/screens/restoreFunds/restoreOrdinals/index.tsx b/src/app/screens/restoreFunds/restoreOrdinals/index.tsx
index 3642d6e75..762488b6e 100644
--- a/src/app/screens/restoreFunds/restoreOrdinals/index.tsx
+++ b/src/app/screens/restoreFunds/restoreOrdinals/index.tsx
@@ -22,7 +22,7 @@ import styled from 'styled-components';
 import OrdinalRow from './ordinalRow';
 
 const RestoreFundTitle = styled.h1((props) => ({
-  ...props.theme.body_l,
+  ...props.theme.typography.body_l,
   marginBottom: 32,
   color: props.theme.colors.white_200,
 }));
@@ -170,7 +170,7 @@ function RestoreOrdinals() {
           </>
         )}
       </Container>
-      <BottomTabBar tab="nft" />
+      <BottomTabBar tab="settings" />
     </>
   );
 }
diff --git a/src/app/screens/settings/index.tsx b/src/app/screens/settings/index.tsx
index 91f64a1e7..8576c24eb 100644
--- a/src/app/screens/settings/index.tsx
+++ b/src/app/screens/settings/index.tsx
@@ -248,13 +248,6 @@ function Setting() {
           toggleValue={hasActivatedOrdinalsKey}
           showDivider
         />
-        <SettingComponent
-          text={t('RECOVER_ASSETS')}
-          onClick={onRestoreFundClick}
-          icon={ArrowIcon}
-          showDivider
-          disabled={!hasActivatedOrdinalsKey}
-        />
         <SettingComponent
           text={t('ENABLE_RARE_SATS')}
           description={t('ENABLE_RARE_SATS_DETAIL')}
@@ -279,7 +272,12 @@ function Setting() {
           toggleFunction={switchActivateRBFState}
           toggleValue={hasActivatedRBFKey}
         />
-
+        <SettingComponent
+          text={t('RECOVER_ASSETS')}
+          onClick={onRestoreFundClick}
+          icon={ArrowIcon}
+          showDivider
+        />
         <SettingComponent
           title={t('ABOUT')}
           text={t('TERMS_OF_SERVICE')}
diff --git a/src/assets/img/nftDashboard/rune_icon.svg b/src/assets/img/nftDashboard/rune_icon.svg
new file mode 100644
index 000000000..341aef2c7
--- /dev/null
+++ b/src/assets/img/nftDashboard/rune_icon.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17.98 18"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M0,0V18H18V0ZM16.49,16.5h-15V1.5h15Z"/><rect class="cls-1" x="2.97" y="2.99" width="12.01" height="12.01"/></svg>
diff --git a/src/locales/en.json b/src/locales/en.json
index 46661fbf5..efd69713f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -665,15 +665,17 @@
     "HOLDS_RARE_SAT": "This inscription holds a rare sat."
   },
   "RESTORE_FUND_SCREEN": {
-    "TITLE": "Restore assets",
+    "TITLE": "Recover assets",
     "DESCRIPTION": "If you sent Ordinals to your Bitcoin payment address or Bitcoin to your ordinals address, you can recover it and send it to the correct address.",
     "RECOVER_BTC": "Recover BTC",
     "RECOVER_BTC_DESC": "If you sent Bitcoin to your Ordinals address.",
     "RECOVER_ORDINALS": "Recover Ordinals",
-    "RECOVER_ORDINALS_DESC": "If you sent Ordinals to your Bitcoin payment address."
+    "RECOVER_ORDINALS_DESC": "If you sent Ordinals to your Bitcoin payment address.",
+    "RECOVER_RUNES": "Recover Runes",
+    "RECOVER_RUNES_DESC": "If you sent Runes to your Bitcoin payment address."
   },
   "RESTORE_BTC_SCREEN": {
-    "TITLE": "Restore BTC",
+    "TITLE": "Recover BTC",
     "BTC": "Bitcoin",
     "TRANSFER": "Transfer",
     "BACK": "Back",
@@ -682,7 +684,7 @@
     "DESCRIPTION": "You have Bitcoin stored in your ordinal address. You can transfer them to your payment address so they can be used for payments and are shown in your balance."
   },
   "RESTORE_ORDINAL_SCREEN": {
-    "TITLE": "Restore Ordinals",
+    "TITLE": "Recover Ordinals",
     "BTC": "Bitcoin",
     "TRANSFER": "Transfer",
     "BACK": "Back",
@@ -690,6 +692,15 @@
     "NO_FUNDS": "You don’t have any Ordinals stored on your Bitcoin payment address.",
     "DESCRIPTION": "You have Ordinals stored in your Bitcoin payment address. You can transfer them to your Ordinals address so that they show up in your collection."
   },
+  "RECOVER_RUNES_SCREEN": {
+    "TITLE": "Recover Runes",
+    "DESCRIPTION": "Your Bitcoin payment address holds some Runes. To avoid accidentally spending them in Bitcoin payments, you can transfer them to your ordinals address, where you can manage your Runes portfolio",
+    "NO_RUNES": "You don't have any Runes stored on your Bitcoin payment address.",
+    "INSUFFICIENT_FUNDS": "You don't have enough bitcoin to cover the restore transaction.",
+    "CONFIRM": "Confirm",
+    "BACK": "Back",
+    "TRANSFER_ALL": "Transfer all"
+  },
   "NFT_DETAIL_SCREEN": {
     "NFT_DETAIL": "Item detail",
     "WEB_GALLERY": "Open gallery",

From 1250117627915b139b47a82f6c81e498c50763ad Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Tue, 23 Apr 2024 11:52:26 +0200
Subject: [PATCH 5/6] chore: add missing divisibility prop in delegation
 section (#218)

---
 .../components/confirmBtcTransaction/delegateSection.tsx    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/components/confirmBtcTransaction/delegateSection.tsx b/src/app/components/confirmBtcTransaction/delegateSection.tsx
index 605ac9405..2415e0da2 100644
--- a/src/app/components/confirmBtcTransaction/delegateSection.tsx
+++ b/src/app/components/confirmBtcTransaction/delegateSection.tsx
@@ -86,7 +86,11 @@ function DelegateSection({ delegations }: Props) {
       </Header>
       {delegations.map((delegation) => (
         <RowContainer key={delegation.runeName}>
-          <RuneAmount tokenName={delegation.runeName} amount={String(delegation.amount)} />
+          <RuneAmount
+            tokenName={delegation.runeName}
+            amount={String(delegation.amount)}
+            divisibility={delegation.divisibility}
+          />
         </RowContainer>
       ))}
       <WarningButton type="button" onClick={() => setShowDelegationInfo((prevState) => !prevState)}>

From 74fe75e8d4824931ebe5b6698202b9f422431182 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 23 Apr 2024 14:30:23 +0300
Subject: [PATCH 6/6] Show cenotaph warning (#219)

* Show cenotaph warning

* Move cenotaph warning to transactionSummary
---
 .../confirmBtcTransaction/index.tsx           |  3 ++
 .../transactionSummary.tsx                    |  5 +++
 .../screens/confirmBtcTransaction/index.tsx   |  2 +-
 .../confirmInscriptionRequest/index.tsx       |  2 +-
 .../restoreFunds/recoverRunes/index.tsx       |  1 +
 src/app/screens/sendBtc/stepDisplay.tsx       |  1 +
 src/app/screens/sendRune/stepDisplay.tsx      |  1 +
 .../screens/signBatchPsbtRequest/index.tsx    | 11 +++----
 src/app/screens/signPsbtRequest/index.tsx     | 33 +++++++------------
 src/locales/en.json                           |  3 +-
 10 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/app/components/confirmBtcTransaction/index.tsx b/src/app/components/confirmBtcTransaction/index.tsx
index 662feb83c..3a316abcd 100644
--- a/src/app/components/confirmBtcTransaction/index.tsx
+++ b/src/app/components/confirmBtcTransaction/index.tsx
@@ -48,6 +48,7 @@ type Props = {
   outputs: btcTransaction.EnhancedOutput[];
   feeOutput?: btcTransaction.TransactionFeeOutput;
   runeSummary?: RuneSummary;
+  showCenotaphCallout: boolean;
   isLoading: boolean;
   isSubmitting: boolean;
   isBroadcast?: boolean;
@@ -76,6 +77,7 @@ function ConfirmBtcTransaction({
   outputs,
   feeOutput,
   runeSummary,
+  showCenotaphCallout,
   isLoading,
   isSubmitting,
   isBroadcast,
@@ -205,6 +207,7 @@ function ConfirmBtcTransaction({
           outputs={outputs}
           feeOutput={feeOutput}
           isPartialTransaction={isPartialTransaction}
+          showCenotaphCallout={showCenotaphCallout}
           getFeeForFeeRate={getFeeForFeeRate}
           onFeeRateSet={onFeeRateSet}
           feeRate={feeRate}
diff --git a/src/app/components/confirmBtcTransaction/transactionSummary.tsx b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
index 20604d20c..b54f3c913 100644
--- a/src/app/components/confirmBtcTransaction/transactionSummary.tsx
+++ b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
@@ -34,6 +34,7 @@ const WarningCallout = styled(Callout)`
 
 type Props = {
   isPartialTransaction: boolean;
+  showCenotaphCallout: boolean;
   inputs: btcTransaction.EnhancedInput[];
   outputs: btcTransaction.EnhancedOutput[];
   feeOutput?: btcTransaction.TransactionFeeOutput;
@@ -49,6 +50,7 @@ type Props = {
 
 function TransactionSummary({
   isPartialTransaction,
+  showCenotaphCallout,
   inputs,
   outputs,
   feeOutput,
@@ -127,6 +129,9 @@ function TransactionSummary({
       {isUnConfirmedInput && (
         <WarningCallout bodyText={t('UNCONFIRMED_UTXO_WARNING')} variant="warning" />
       )}
+      {showCenotaphCallout && (
+        <WarningCallout variant="danger" bodyText={t('RUNES_CENOTAPH_WARNING')} />
+      )}
       {runeSummary?.mint && !runeSummary?.mint?.runeIsOpen && (
         <WarningCallout bodyText={t('RUNE_TERM_ENDED')} variant="danger" />
       )}
diff --git a/src/app/screens/confirmBtcTransaction/index.tsx b/src/app/screens/confirmBtcTransaction/index.tsx
index 61a9eb014..ce9985a8f 100644
--- a/src/app/screens/confirmBtcTransaction/index.tsx
+++ b/src/app/screens/confirmBtcTransaction/index.tsx
@@ -242,7 +242,7 @@ function ConfirmBtcTransaction() {
           description={t('BTC_TRANSFER_DANGER_ALERT_DESC')}
           buttonText={t('BACK')}
           onClose={onClosePress}
-          secondButtonText={t('CONITNUE')}
+          secondButtonText={t('CONTINUE')}
           onButtonClick={onClosePress}
           onSecondButtonClick={onContinueButtonClick}
           isWarningAlert
diff --git a/src/app/screens/confirmInscriptionRequest/index.tsx b/src/app/screens/confirmInscriptionRequest/index.tsx
index 6ecc408ce..be57df492 100644
--- a/src/app/screens/confirmInscriptionRequest/index.tsx
+++ b/src/app/screens/confirmInscriptionRequest/index.tsx
@@ -344,7 +344,7 @@ function ConfirmInscriptionRequest() {
           description={t('CONFIRM_TRANSACTION.BTC_TRANSFER_DANGER_ALERT_DESC')}
           buttonText={t('CONFIRM_TRANSACTION.BACK')}
           onClose={onClosePress}
-          secondButtonText={t('CONITNUE')}
+          secondButtonText={t('CONTINUE')}
           onButtonClick={onClosePress}
           onSecondButtonClick={onContinueButtonClick}
           isWarningAlert
diff --git a/src/app/screens/restoreFunds/recoverRunes/index.tsx b/src/app/screens/restoreFunds/recoverRunes/index.tsx
index 4844bb58f..cb7997505 100644
--- a/src/app/screens/restoreFunds/recoverRunes/index.tsx
+++ b/src/app/screens/restoreFunds/recoverRunes/index.tsx
@@ -176,6 +176,7 @@ function RecoverRunes() {
         inputs={summary?.inputs ?? []}
         outputs={summary?.outputs ?? []}
         feeOutput={summary?.feeOutput}
+        showCenotaphCallout={!!summary?.runeOp?.Cenotaph?.flaws}
         runeSummary={runeSummary}
         isLoading={isLoading}
         isSubmitting={isBroadcasting}
diff --git a/src/app/screens/sendBtc/stepDisplay.tsx b/src/app/screens/sendBtc/stepDisplay.tsx
index 0f344e71d..6caae368d 100644
--- a/src/app/screens/sendBtc/stepDisplay.tsx
+++ b/src/app/screens/sendBtc/stepDisplay.tsx
@@ -125,6 +125,7 @@ function StepDisplay({
           inputs={summary.inputs}
           outputs={summary.outputs}
           feeOutput={summary.feeOutput}
+          showCenotaphCallout={!!summary?.runeOp?.Cenotaph?.flaws}
           isLoading={false}
           confirmText={t('COMMON.CONFIRM')}
           cancelText={t('COMMON.CANCEL')}
diff --git a/src/app/screens/sendRune/stepDisplay.tsx b/src/app/screens/sendRune/stepDisplay.tsx
index 3310e4151..c2870b1a5 100644
--- a/src/app/screens/sendRune/stepDisplay.tsx
+++ b/src/app/screens/sendRune/stepDisplay.tsx
@@ -131,6 +131,7 @@ function StepDisplay({
           inputs={summary.inputs}
           outputs={summary.outputs}
           feeOutput={summary.feeOutput}
+          showCenotaphCallout={!!summary?.runeOp?.Cenotaph?.flaws}
           runeSummary={runeSummary}
           isLoading={false}
           confirmText={t('COMMON.CONFIRM')}
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index e71c72fdf..7916a980d 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -124,12 +124,8 @@ interface TxResponse {
   psbtBase64: string;
 }
 
-type PsbtSummary = {
-  inputs: btcTransaction.EnhancedInput[];
-  outputs: btcTransaction.EnhancedOutput[];
-  feeOutput?: btcTransaction.TransactionFeeOutput | undefined;
-  hasSigHashNone: boolean;
-};
+// TODO: export this from core
+type PsbtSummary = Awaited<ReturnType<btcTransaction.EnhancedPsbt['getSummary']>>;
 
 function SignBatchPsbtRequest() {
   const { btcAddress, ordinalsAddress, selectedAccount, network } = useWalletSelector();
@@ -434,6 +430,9 @@ function SignBatchPsbtRequest() {
                 feeOutput={parsedPsbts[currentPsbtIndex].summary.feeOutput}
                 runeSummary={parsedPsbts[currentPsbtIndex].runeSummary}
                 isPartialTransaction={!parsedPsbts[currentPsbtIndex].summary.feeOutput}
+                showCenotaphCallout={
+                  !!parsedPsbts[currentPsbtIndex].summary.runeOp?.Cenotaph?.flaws
+                }
               />
             )}
           </CustomizedModalContainer>
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index dd8d0080f..c890a917d 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -1,7 +1,6 @@
 import { makeRPCError, sendRpcResponse } from '@common/utils/rpc/helpers';
 import ConfirmBitcoinTransaction from '@components/confirmBtcTransaction';
 import RequestError from '@components/requests/requestError';
-import useBtcClient from '@hooks/useBtcClient';
 import useHasFeature from '@hooks/useHasFeature';
 import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -18,6 +17,9 @@ import { RpcErrorCode } from 'sats-connect';
 import useSignPsbt from './useSignPsbt';
 import useSignPsbtValidationGate from './useSignPsbtValidationGate';
 
+// TODO: export this from core
+type PSBTSummary = Awaited<ReturnType<btcTransaction.EnhancedPsbt['getSummary']>>;
+
 function SignPsbtRequest() {
   const navigate = useNavigate();
 
@@ -26,10 +28,7 @@ function SignPsbtRequest() {
 
   const [isLoading, setIsLoading] = useState(true);
   const [isSigning, setIsSigning] = useState(false);
-  const [inputs, setInputs] = useState<btcTransaction.EnhancedInput[]>([]);
-  const [outputs, setOutputs] = useState<btcTransaction.EnhancedOutput[]>([]);
-  const [feeOutput, setFeeOutput] = useState<btcTransaction.TransactionFeeOutput | undefined>();
-  const [hasSigHashNone, setHasSigHashNone] = useState(false);
+  const [summary, setSummary] = useState<PSBTSummary | undefined>();
   const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>(undefined);
   const hasRunesSupport = useHasFeature('RUNES_SUPPORT');
 
@@ -49,19 +48,10 @@ function SignPsbtRequest() {
 
     parsedPsbt
       .getSummary()
-      .then(async (summary) => {
-        const {
-          feeOutput: psbtFeeOutput,
-          inputs: psbtInputs,
-          outputs: psbtOutputs,
-          hasSigHashNone: psbtHasSigHashNone,
-        } = summary;
-        setFeeOutput(psbtFeeOutput);
-        setInputs(psbtInputs);
-        setOutputs(psbtOutputs);
-        setHasSigHashNone(psbtHasSigHashNone);
+      .then(async (txSummary) => {
+        setSummary(txSummary);
         if (hasRunesSupport) {
-          setRuneSummary(await parseSummaryForRunes(txnContext, summary, network.type));
+          setRuneSummary(await parseSummaryForRunes(txnContext, txSummary, network.type));
         }
         setIsLoading(false);
       })
@@ -138,14 +128,15 @@ function SignPsbtRequest() {
     />
   ) : (
     <ConfirmBitcoinTransaction
-      inputs={inputs}
-      outputs={outputs}
-      feeOutput={feeOutput}
+      inputs={summary?.inputs ?? []}
+      outputs={summary?.outputs ?? []}
+      feeOutput={summary?.feeOutput}
+      showCenotaphCallout={!!summary?.runeOp?.Cenotaph?.flaws}
       runeSummary={runeSummary}
       isLoading={isLoading}
       isSubmitting={isSigning}
       isBroadcast={payload.broadcast}
-      hasSigHashNone={hasSigHashNone}
+      hasSigHashNone={summary?.hasSigHashNone}
       confirmText={t('CONFIRM')}
       cancelText={t('CANCEL')}
       onCancel={onCancel}
diff --git a/src/locales/en.json b/src/locales/en.json
index efd69713f..c8365da93 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -374,10 +374,11 @@
     "ORDINAL_DETECTED_ACTION": "Move to my ordinals address",
     "BTC_TRANSFER_DANGER_ALERT_TITLE": "Danger",
     "BTC_TRANSFER_DANGER_ALERT_DESC": "You are about to make a Bitcoin transfer which contains an ordinal inscription. Once transferred out of the wallet, you will not be able to recover them.",
-    "CONITNUE": "Continue",
+    "CONTINUE": "Continue",
     "BACK": "Back",
     "HIGH_FEE_WARNING_TEXT": "The estimated transaction fee for this transaction is very high.",
     "UNCONFIRMED_BALANCE_WARNING": "You are spending unconfirmed outputs in this transaction. This may lower the effective fee rate causing delays in transaction confirmation",
+    "RUNES_CENOTAPH_WARNING": "This transaction will burn all input Runes. Make sure you trust the requesting app.",
     "LEDGER": {
       "CONNECT": {
         "TITLE": "Connect your hardware wallet",