diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.module.scss b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.module.scss
new file mode 100644
index 0000000000..515c2532fe
--- /dev/null
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.module.scss
@@ -0,0 +1,63 @@
+@import '../../../../../../../../packages/common/src/ui/styles/theme.scss';
+@import '../../../../../../../../packages/common/src/ui/styles/abstracts/typography';
+
+.opReturnMessageInput {
+  margin-top: size_unit(2);
+  padding-bottom: size_unit(3);
+  width: 100%;
+
+  :global(.ant-input-affix-wrapper) {
+    transition: none !important;
+  }
+
+  &.visibleCounter {
+    padding-bottom: size_unit(2.5);
+
+    :global(.ant-input-suffix) {
+      position: absolute;
+      right: size_unit(0.5);
+      top: size_unit(0.5);
+      width: size_unit(6.5);
+    }
+  }
+
+  input {
+    @include text-bodyLarge-medium;
+    color: var(--text-color-primary) !important;
+    transition: none;
+    ::placeholder {
+      color: var(--text-color-secondary) !important;
+    }
+  }
+
+  @media (max-width: 400px) {
+    margin-top: size_unit(1);
+    padding-bottom: size_unit(5);
+
+    &.visibleCounter {
+      padding-bottom: size_unit(4);
+    }
+  }
+
+  .suffixContent {
+    margin-right: -7px;
+    &.focus {
+      margin-bottom: -#{size_unit(1.5)};
+    }
+  }
+}
+
+.characterCounter {
+  margin: size_unit(0.5) 0 0;
+  padding-left: size_unit(3);
+  @include text-form-label($weight: 500);
+  color: var(--text-color-secondary);
+
+  &.error {
+    color: var(--data-pink);
+  }
+}
+
+.iconSize {
+  font-size: size_unit(3) !important;
+}
diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.tsx b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.tsx
new file mode 100644
index 0000000000..17bdfdafec
--- /dev/null
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/OpReturnMessageInput.tsx
@@ -0,0 +1,78 @@
+/* eslint-disable unicorn/no-useless-undefined */
+import React, { useState } from 'react';
+import { Input, TextBoxItem } from '@lace/common';
+import classnames from 'classnames';
+import styles from './OpReturnMessageInput.module.scss';
+import { useTranslation, Trans } from 'react-i18next';
+
+const MAX_LENGTH = 80;
+
+interface OpReturnInputProps {
+  onOpReturnMessageChange: (value: string) => void;
+  opReturnMessage: string;
+  disabled?: boolean;
+}
+
+export const OpReturnMessageInput: React.FC<OpReturnInputProps> = ({
+  onOpReturnMessageChange,
+  opReturnMessage,
+  disabled = false
+}) => {
+  const { t } = useTranslation();
+  const [value, setOpReturnMessageMsg] = useState(opReturnMessage);
+  const [focused, setFocused] = useState(false);
+  const handleChange = ({ target }: React.ChangeEvent<HTMLInputElement>) => {
+    setOpReturnMessageMsg(target.value);
+    onOpReturnMessageChange(target.value);
+  };
+
+  const handleClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+    event.stopPropagation();
+    setOpReturnMessageMsg(undefined);
+    onOpReturnMessageChange('');
+  };
+
+  const handleFocusedState = () => setFocused((prev) => !prev);
+
+  const hasReachedCharLimit = value?.length > MAX_LENGTH;
+  const displayCounter = !!value || focused;
+  return (
+    <div
+      data-testid="opReturn-message-input-container"
+      className={classnames(styles.opReturnMessageInput, { [styles.visibleCounter]: displayCounter })}
+    >
+      <Input
+        onFocus={handleFocusedState}
+        onBlur={handleFocusedState}
+        data-testid="opReturn-message-input"
+        value={value}
+        onChange={handleChange}
+        suffix={
+          <div
+            data-testid="opReturn-message-input-suffix"
+            className={classnames(styles.suffixContent, { [styles.focus]: focused || value?.length > 0 })}
+          >
+            <TextBoxItem iconClassName={styles.iconSize} onClick={handleClick} disabled={!value} />
+          </div>
+        }
+        label={t('browserView.transaction.send.metadata.addAOpReturnNote')}
+        focus={focused}
+        disabled={disabled}
+      />
+
+      {displayCounter && (
+        <p
+          data-testid="opReturn-message-counter"
+          className={classnames(styles.characterCounter, {
+            [styles.error]: hasReachedCharLimit
+          })}
+        >
+          <Trans
+            values={{ count: `${value?.length || 0}/${MAX_LENGTH}` }}
+            i18nKey="browserView.transaction.send.metadata.count"
+          />
+        </p>
+      )}
+    </div>
+  );
+};
diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/ReviewTransaction.tsx b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/ReviewTransaction.tsx
index 0829d89a95..f6dd4de42b 100644
--- a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/ReviewTransaction.tsx
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/ReviewTransaction.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable complexity */
+/* eslint-disable complexity, sonarjs/cognitive-complexity */
 /* eslint-disable no-magic-numbers */
 import React from 'react';
 import { renderLabel, RowContainer } from '@lace/core';
@@ -16,6 +16,7 @@ interface ReviewTransactionProps {
   unsignedTransaction: Bitcoin.UnsignedTransaction & { isHandle: boolean; handle: string };
   btcToUsdRate: number;
   feeRate: number;
+  opReturnMessage: string;
   estimatedTime: string;
   onConfirm: () => void;
   onClose: () => void;
@@ -29,12 +30,14 @@ export const ReviewTransaction: React.FC<ReviewTransactionProps> = ({
   estimatedTime,
   onConfirm,
   isPopupView,
-  onClose
+  onClose,
+  opReturnMessage
 }) => {
   const { t } = useTranslation();
   const amount = Number(unsignedTransaction.amount);
   const usdValue = (amount / SATS_IN_BTC) * btcToUsdRate;
   const feeInBtc = unsignedTransaction.fee;
+  const hasOpReturn = opReturnMessage && opReturnMessage.length > 0;
 
   return (
     <Flex flexDirection="column" w="$fill" className={mainStyles.container}>
@@ -94,6 +97,24 @@ export const ReviewTransaction: React.FC<ReviewTransactionProps> = ({
           </RowContainer>
         </Box>
 
+        {hasOpReturn && (
+          <Box w="$fill" mt={isPopupView ? '$24' : '$32'}>
+            <RowContainer>
+              {renderLabel({
+                label: t('core.outputSummaryList.note'),
+                dataTestId: 'output-summary-note'
+              })}
+              <Flex flexDirection="column">
+                <Flex flexDirection="column" w="$fill" alignItems="flex-end" gap="$4">
+                  <Text.Address className={styles.address} data-testid="output-summary-note">
+                    {opReturnMessage}
+                  </Text.Address>
+                </Flex>
+              </Flex>
+            </RowContainer>
+          </Box>
+        )}
+
         <Box w="$fill" mt={isPopupView ? '$32' : '$40'} mb="$8" className={styles.divider} />
 
         <Box w="$fill" mt={isPopupView ? '$24' : '$32'}>
diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendFlow.tsx b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendFlow.tsx
index 745dfa3c84..12d20e8529 100644
--- a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendFlow.tsx
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendFlow.tsx
@@ -80,6 +80,7 @@ type BuildTxProps = {
   knownAddresses: Bitcoin.DerivedAddress[];
   changeAddress: string;
   recipientAddress: string;
+  opReturnMessage: string;
   feeRate: number;
   amount: bigint;
   utxos: Bitcoin.UTxO[];
@@ -93,12 +94,14 @@ const buildTransaction = ({
   feeRate,
   amount,
   utxos,
+  opReturnMessage,
   network
 }: BuildTxProps): Bitcoin.UnsignedTransaction =>
   new Bitcoin.TransactionBuilder(network, feeRate, knownAddresses)
     .setChangeAddress(changeAddress)
     .setUtxoSet(utxos)
     .addOutput(recipientAddress, amount)
+    .addOpReturnOutput(opReturnMessage)
     .build();
 
 const btcStringToSatoshisBigint = (btcString: string): bigint => {
@@ -132,7 +135,7 @@ export const SendFlow: React.FC = () => {
   const [confirmationHash, setConfirmationHash] = useState<string>('');
   const [txError, setTxError] = useState<Error | undefined>();
   const [isWarningModalVisible, setIsWarningModalVisible] = useState(false);
-
+  const [opReturnMessage, setOpReturnMessage] = useState<string>('');
   const { priceResult } = useFetchCoinPrice();
   const { bitcoinWallet } = useWalletManager();
 
@@ -268,7 +271,8 @@ export const SendFlow: React.FC = () => {
         feeRate: newFeeRate,
         amount: btcStringToSatoshisBigint(amount),
         utxos,
-        network
+        network,
+        opReturnMessage
       }),
       isHandle: address.isHandle,
       handle: address.isHandle ? address.address : ''
@@ -333,6 +337,8 @@ export const SendFlow: React.FC = () => {
           onContinue={goToReview}
           network={network}
           hasUtxosInMempool={hasUtxosInMempool}
+          onOpReturnMessageChange={setOpReturnMessage}
+          opReturnMessage={opReturnMessage}
         />
       );
     }
@@ -348,6 +354,7 @@ export const SendFlow: React.FC = () => {
             feeRate={feeRate}
             estimatedTime={estimatedTime}
             onConfirm={goToPassword}
+            opReturnMessage={opReturnMessage}
           />
         </>
       );
diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendStepOne.tsx b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendStepOne.tsx
index c6d9c24398..8ac7f49ab5 100644
--- a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendStepOne.tsx
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/SendStepOne.tsx
@@ -21,6 +21,7 @@ import debounce from 'lodash/debounce';
 import { CustomConflictError, CustomError, ensureHandleOwnerHasntChanged, verifyHandle } from '@utils/validators';
 import { AddressValue, HandleVerificationState } from './types';
 import { CheckCircleOutlined, ExclamationCircleOutlined, LoadingOutlined } from '@ant-design/icons';
+import { OpReturnMessageInput } from './OpReturnMessageInput';
 
 const SATS_IN_BTC = 100_000_000;
 
@@ -51,6 +52,8 @@ interface SendStepOneProps {
   onClose: () => void;
   network: Bitcoin.Network | null;
   hasUtxosInMempool: boolean;
+  onOpReturnMessageChange: (value: string) => void;
+  opReturnMessage: string;
 }
 
 const InputError = ({
@@ -87,7 +90,9 @@ export const SendStepOne: React.FC<SendStepOneProps> = ({
   isPopupView,
   onClose,
   network,
-  hasUtxosInMempool
+  hasUtxosInMempool,
+  onOpReturnMessageChange,
+  opReturnMessage
 }) => {
   const { t } = useTranslation();
   const numericAmount = Number.parseFloat(amount) || 0;
@@ -369,6 +374,12 @@ export const SendStepOne: React.FC<SendStepOneProps> = ({
           />
         </Box>
 
+        <OpReturnMessageInput
+          opReturnMessage={opReturnMessage}
+          disabled={hasUtxosInMempool}
+          onOpReturnMessageChange={onOpReturnMessageChange}
+        />
+
         <Box mt={isPopupView ? '$24' : '$32'}>
           {isPopupView ? (
             <Text.Body.Large weight="$bold">{t('browserView.transaction.btc.send.feeRate')}</Text.Body.Large>
@@ -445,7 +456,14 @@ export const SendStepOne: React.FC<SendStepOneProps> = ({
         className={mainStyles.buttons}
       >
         <Button
-          disabled={hasNoValue || exceedsBalance || !address || address?.address?.trim() === '' || !isValidAddress}
+          disabled={
+            hasNoValue ||
+            exceedsBalance ||
+            !address ||
+            address?.address?.trim() === '' ||
+            !isValidAddress ||
+            opReturnMessage?.length > 80
+          }
           color="primary"
           block
           size="medium"
diff --git a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/index.ts b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/index.ts
index c407a7731e..9c6f296af5 100644
--- a/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/index.ts
+++ b/apps/browser-extension-wallet/src/views/bitcoin-mode/features/send/components/index.ts
@@ -1,2 +1,3 @@
 export * from './SendContainer';
 export * from './BitcoinSendDrawer';
+export * from './OpReturnMessageInput';
diff --git a/packages/bitcoin/src/wallet/lib/input-selection/GreedyInputSelector.ts b/packages/bitcoin/src/wallet/lib/input-selection/GreedyInputSelector.ts
index 1a8a7f1338..4fe1474abb 100644
--- a/packages/bitcoin/src/wallet/lib/input-selection/GreedyInputSelector.ts
+++ b/packages/bitcoin/src/wallet/lib/input-selection/GreedyInputSelector.ts
@@ -13,7 +13,8 @@ export class GreedyInputSelector implements InputSelector {
     changeAddress: string,
     utxos: UTxO[],
     outputs: { address: string; value: bigint }[],
-    feeRate: number
+    feeRate: number,
+    hasOpReturn: boolean
   ): { selectedUTxOs: UTxO[]; outputs: { address: string; value: number }[]; fee: number } | undefined {
     const selected: UTxO[] = [];
     const totalOutput = outputs.reduce((acc, o) => acc + o.value, ZERO);
@@ -23,7 +24,7 @@ export class GreedyInputSelector implements InputSelector {
     for (const utxo of utxos) {
       selected.push(utxo);
       inputSum += utxo.satoshis;
-      fee = this.computeFee(selected.length, outputs.length + 1, feeRate);
+      fee = this.computeFee(selected.length, outputs.length + 1, feeRate, hasOpReturn);
       if (inputSum >= totalOutput + BigInt(fee)) break;
     }
 
@@ -39,7 +40,8 @@ export class GreedyInputSelector implements InputSelector {
         remaining: utxos.slice(selected.length),
         inputSum,
         totalOutput,
-        outputsCount: outputs.length
+        outputsCount: outputs.length,
+        hasOpReturn
       });
       change = newChange;
       fee += feeDelta;
@@ -60,8 +62,9 @@ export class GreedyInputSelector implements InputSelector {
   }
 
   /** Estimate the fee for a given input / output count */
-  private computeFee(inputCount: number, outputCount: number, feeRate: number): number {
-    const size = inputCount * INPUT_SIZE + outputCount * OUTPUT_SIZE + TRANSACTION_OVERHEAD;
+  private computeFee(inputCount: number, outputCount: number, feeRate: number, hasOpReturn: boolean): number {
+    const size =
+      inputCount * INPUT_SIZE + (outputCount + (hasOpReturn ? 1 : 0)) * OUTPUT_SIZE + Number(TRANSACTION_OVERHEAD);
     return Math.ceil(size * feeRate);
   }
 
@@ -76,7 +79,8 @@ export class GreedyInputSelector implements InputSelector {
     remaining,
     inputSum,
     totalOutput,
-    outputsCount
+    outputsCount,
+    hasOpReturn
   }: {
     change: bigint;
     feeRate: number;
@@ -85,6 +89,7 @@ export class GreedyInputSelector implements InputSelector {
     inputSum: bigint;
     totalOutput: bigint;
     outputsCount: number;
+    hasOpReturn: boolean;
   }): { change: bigint; fee: number } {
     if (change === ZERO || Number(change) >= DUST_THRESHOLD) return { change, fee: 0 };
 
@@ -93,7 +98,7 @@ export class GreedyInputSelector implements InputSelector {
 
     for (const utxo of remaining) {
       const newInputSum = inputSum + utxo.satoshis;
-      const newFee = this.computeFee(selected.length + 1, outputsCount + 1, feeRate);
+      const newFee = this.computeFee(selected.length + 1, outputsCount + 1, feeRate, hasOpReturn);
       const newChange = newInputSum - totalOutput - BigInt(newFee);
 
       const rescued = newChange - originalChange;
@@ -101,7 +106,7 @@ export class GreedyInputSelector implements InputSelector {
 
       if (rescued >= extraCost && newChange >= BigInt(DUST_THRESHOLD)) {
         selected.push(utxo);
-        feeDelta = newFee - this.computeFee(selected.length - 1, outputsCount + 1, feeRate);
+        feeDelta = newFee - this.computeFee(selected.length - 1, outputsCount + 1, feeRate, hasOpReturn);
         return { change: newChange, fee: feeDelta };
       }
     }
diff --git a/packages/bitcoin/src/wallet/lib/input-selection/InputSelector.ts b/packages/bitcoin/src/wallet/lib/input-selection/InputSelector.ts
index b3bc396c53..2b3423b27d 100644
--- a/packages/bitcoin/src/wallet/lib/input-selection/InputSelector.ts
+++ b/packages/bitcoin/src/wallet/lib/input-selection/InputSelector.ts
@@ -11,6 +11,7 @@ export interface InputSelector {
    * @param utxos - Array of available UTXOs.
    * @param outputs - Array of desired outputs.
    * @param feeRate - Fee rate in satoshis per byte.
+   * @param hasOpReturn - Indicates if the transaction includes an OP_RETURN output.
    * @returns An object containing the selected UTXOs, the outputs as returned by coinselect (which might include a change output),
    *          and the calculated fee. Returns null if no valid selection was found.
    */
@@ -18,6 +19,7 @@ export interface InputSelector {
     changeAddress: string,
     utxos: UTxO[],
     outputs: { address: string; value: bigint }[],
-    feeRate: number
+    feeRate: number,
+    hasOpReturn: boolean
   ): { selectedUTxOs: UTxO[]; outputs: { address: string; value: number }[]; fee: number } | undefined;
 }
diff --git a/packages/bitcoin/src/wallet/lib/providers/BitcoinDataProvider.ts b/packages/bitcoin/src/wallet/lib/providers/BitcoinDataProvider.ts
index 9e46c928a5..ead5944c75 100644
--- a/packages/bitcoin/src/wallet/lib/providers/BitcoinDataProvider.ts
+++ b/packages/bitcoin/src/wallet/lib/providers/BitcoinDataProvider.ts
@@ -76,10 +76,12 @@ export type InputEntry = UTxO;
  *
  * @property {string} address - The address involved in the transaction input or output.
  * @property {bigint} satoshis - The amount in satoshis for this input or output.
+ * @property {string} opReturnData - The OP_RETURN data associated with this output, if any.
  */
 export type OutputEntry = {
   readonly address: string;
   readonly satoshis: bigint;
+  readonly opReturnData?: string;
 };
 
 /**
diff --git a/packages/bitcoin/src/wallet/lib/tx-builder/TransactionBuilder.ts b/packages/bitcoin/src/wallet/lib/tx-builder/TransactionBuilder.ts
index 74ec0f6964..532824647e 100644
--- a/packages/bitcoin/src/wallet/lib/tx-builder/TransactionBuilder.ts
+++ b/packages/bitcoin/src/wallet/lib/tx-builder/TransactionBuilder.ts
@@ -28,6 +28,7 @@ export class TransactionBuilder {
   private changeAddress?: string;
   private signers: DerivedAddress[] = [];
   private inputSelector: InputSelector = new GreedyInputSelector();
+  private opReturnData?: Buffer;
 
   /**
    * Initializes the transaction builder.
@@ -95,6 +96,29 @@ export class TransactionBuilder {
     return this;
   }
 
+  /**
+   * Adds an OP_RETURN message to the transaction.
+   *
+   * @param message - The message to embed (string, UTF-8). Max 80 bytes after encoding.
+   *                  If null, removes any existing OP_RETURN data.
+   * @returns The builder instance for chaining.
+   */
+  public addOpReturnOutput(message: string | null): this {
+    if (!message?.trim()) {
+      this.opReturnData = undefined;
+      return this;
+    }
+
+    const data = Buffer.from(message, 'utf8');
+
+    if (data.length > 80) {
+      throw new Error(`OP_RETURN message exceeds 80 bytes (actual: ${data.length}).`);
+    }
+
+    this.opReturnData = data;
+    return this;
+  }
+
   /**
    * Builds the transaction by selecting UTXOs (using either the provided input selector or a fallback),
    * adding inputs and outputs (including a change output if needed), and calculating fees.
@@ -119,7 +143,13 @@ export class TransactionBuilder {
     let fee = 0;
     let coinselectOutputs: { address: string; value: number }[] = [];
 
-    const result = this.inputSelector.selectInputs(this.changeAddress, this.utxos, this.outputs, feeRateSatoshis);
+    const result = this.inputSelector.selectInputs(
+      this.changeAddress,
+      this.utxos,
+      this.outputs,
+      feeRateSatoshis,
+      !!this.opReturnData
+    );
     if (!result) {
       throw new Error('Insufficient funds or coin selection failed.');
     }
@@ -158,7 +188,19 @@ export class TransactionBuilder {
       }
     });
 
-    const vBytes = selectedUTxOs.length * INPUT_SIZE + coinselectOutputs.length * OUTPUT_SIZE + TRANSACTION_OVERHEAD;
+    if (this.opReturnData) {
+      const embed = bitcoin.payments.embed({ data: [this.opReturnData] });
+      this.psbt.addOutput({
+        script: embed.output!,
+        value: 0
+      });
+    }
+
+    const opReturnOutput = this.opReturnData ? 1 : 0;
+    const vBytes =
+      selectedUTxOs.length * INPUT_SIZE +
+      (coinselectOutputs.length + opReturnOutput) * OUTPUT_SIZE +
+      TRANSACTION_OVERHEAD;
 
     return {
       context: this.psbt,
diff --git a/packages/bitcoin/src/wallet/lib/tx-builder/utils.ts b/packages/bitcoin/src/wallet/lib/tx-builder/utils.ts
index 873a345094..f75e68e819 100644
--- a/packages/bitcoin/src/wallet/lib/tx-builder/utils.ts
+++ b/packages/bitcoin/src/wallet/lib/tx-builder/utils.ts
@@ -48,12 +48,24 @@ export const historyEntryFromRawTx = async (
     })
   );
 
-  const resolvedOutputs = tx.outs.map((output) => {
-    const address = bitcoin.address.fromOutputScript(output.script, bitcoinNetwork);
-    return {
-      address,
-      satoshis: BigInt(output.value)
-    };
+  const resolvedOutputs = tx.outs.map((o) => {
+    const chunks = bitcoin.script.decompile(o.script);
+    const isNullData = chunks && chunks[0] === bitcoin.opcodes.OP_RETURN;
+
+    if (isNullData) {
+      const payloadChunks = chunks.slice(1).filter((c: Buffer) => Buffer.isBuffer(c)) as Buffer[];
+
+      const opReturnData = Buffer.concat(payloadChunks).toString('utf8');
+
+      return {
+        address: '',
+        satoshis: BigInt(o.value),
+        opReturnData
+      };
+    }
+
+    const address = bitcoin.address.fromOutputScript(o.script, bitcoinNetwork);
+    return { address, satoshis: BigInt(o.value) };
   });
 
   return {
diff --git a/packages/bitcoin/test/GreedyInputSelector.test.ts b/packages/bitcoin/test/GreedyInputSelector.test.ts
index 7d8281f6b0..e5578b102d 100644
--- a/packages/bitcoin/test/GreedyInputSelector.test.ts
+++ b/packages/bitcoin/test/GreedyInputSelector.test.ts
@@ -18,7 +18,7 @@ describe('GreedyInputSelector', () => {
   it('selects sufficient UTxOs and returns change', () => {
     const utxos = [createUTxO(BigInt(5000)), createUTxO(BigInt(8000))];
     const outputs = [{ address: 'address1', value: BigInt(4000) }];
-    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate, false);
 
     expect(result).toBeDefined();
     expect(result!.selectedUTxOs.length).toBeGreaterThan(0);
@@ -29,7 +29,7 @@ describe('GreedyInputSelector', () => {
   it('returns undefined if inputs are insufficient', () => {
     const utxos = [createUTxO(BigInt(1000))];
     const outputs = [{ address: 'address1', value: BigInt(2000) }];
-    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate, false);
 
     expect(result).toBeUndefined();
   });
@@ -40,7 +40,7 @@ describe('GreedyInputSelector', () => {
       { address: 'address1', value: BigInt(3000) },
       { address: 'address2', value: BigInt(2000) }
     ];
-    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate, false);
 
     expect(result).toBeDefined();
     const sumOutputs = result!.outputs.reduce((acc, o) => acc + o.value, 0);
@@ -51,7 +51,7 @@ describe('GreedyInputSelector', () => {
   it('adds dust change to fee instead of outputting it', () => {
     const utxos = [createUTxO(BigInt(6000))];
     const outputs = [{ address: 'address1', value: BigInt(5500) }];
-    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate, false);
 
     expect(result).toBeDefined();
     expect(result!.outputs.some((o) => o.address === changeAddress)).toBe(false);
@@ -64,7 +64,7 @@ describe('GreedyInputSelector', () => {
     const utxos = [createUTxO(BigInt(6000), 'utxo1'), createUTxO(BigInt(1000), 'utxo2')];
     const outputs = [{ address: 'dest1', value: BigInt(5500) }];
 
-    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, feeRate, false);
 
     expect(result).toBeDefined();
     // Should include both inputs because rescuing dust is profitable.
@@ -84,7 +84,7 @@ describe('GreedyInputSelector', () => {
     const utxos = [createUTxO(BigInt(9000), 'big_utxo'), createUTxO(BigInt(600), 'small_utxo')];
     const outputs = [{ address: 'dest1', value: BigInt(8000) }];
 
-    const result = selector.selectInputs(changeAddress, utxos, outputs, bigFeeRate);
+    const result = selector.selectInputs(changeAddress, utxos, outputs, bigFeeRate, false);
 
     expect(result).toBeDefined();
     // Only the first (large) UTxO should be used.
diff --git a/packages/translation/src/lib/translations/browser-extension-wallet/en.json b/packages/translation/src/lib/translations/browser-extension-wallet/en.json
index 672d2f6eee..b6ac125e0a 100644
--- a/packages/translation/src/lib/translations/browser-extension-wallet/en.json
+++ b/packages/translation/src/lib/translations/browser-extension-wallet/en.json
@@ -539,6 +539,7 @@
   "browserView.transaction.send.group.label1": "simple",
   "browserView.transaction.send.group.label2": "advanced",
   "browserView.transaction.send.metadata.addANote": "Add a note (max 160 char.)",
+  "browserView.transaction.send.metadata.addAOpReturnNote": "Add a note (max 80 char.)",
   "browserView.transaction.send.metadata.count": "{{count}} characters",
   "browserView.transaction.send.metadata.note": "Note",
   "browserView.transaction.send.password.placeholder": "Password",
diff --git a/packages/translation/src/lib/translations/core/en.json b/packages/translation/src/lib/translations/core/en.json
index ba89febb2c..c973ceab71 100644
--- a/packages/translation/src/lib/translations/core/en.json
+++ b/packages/translation/src/lib/translations/core/en.json
@@ -334,6 +334,7 @@
   "core.outputSummaryList.noLimit": "No limit",
   "core.outputSummaryList.utc": "UTC",
   "core.outputSummaryList.recipientAddress": "Recipient address",
+  "core.outputSummaryList.note": "Note",
   "core.outputSummaryList.sending": "Sending",
   "core.outputSummaryList.txFee": "Transaction fee",
   "core.password.feedback.1": "Weak password. Add some numbers and characters to make it stronger.",