diff --git a/cashtab/extension/public/manifest.json b/cashtab/extension/public/manifest.json
--- a/cashtab/extension/public/manifest.json
+++ b/cashtab/extension/public/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "Cashtab",
     "description": "A browser-integrated eCash wallet from Bitcoin ABC",
-    "version": "3.18.2",
+    "version": "3.20.0",
     "content_scripts": [
         {
             "matches": ["file://*/*", "http://*/*", "https://*/*"],
diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "cashtab",
-    "version": "2.19.1",
+    "version": "2.20.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "cashtab",
-            "version": "2.19.1",
+            "version": "2.20.0",
             "dependencies": {
                 "@ant-design/icons": "^5.3.0",
                 "@bitgo/utxo-lib": "^9.33.0",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cashtab",
-    "version": "2.19.1",
+    "version": "2.20.0",
     "private": true,
     "scripts": {
         "start": "node scripts/start.js",
diff --git a/cashtab/src/components/Common/Atoms.js b/cashtab/src/components/Common/Atoms.js
--- a/cashtab/src/components/Common/Atoms.js
+++ b/cashtab/src/components/Common/Atoms.js
@@ -28,15 +28,6 @@
     color: ${props => props.theme.primary};
 `;
 
-export const FormLabel = styled.label`
-    font-size: 16px;
-    margin-bottom: 5px;
-    text-align: left;
-    width: 100%;
-    display: inline-block;
-    color: ${props => props.theme.contrast};
-`;
-
 export const WalletInfoCtn = styled.div`
     background: ${props => props.theme.walletInfoContainer};
     padding: 12px 20px;
diff --git a/cashtab/src/components/Common/Inputs.js b/cashtab/src/components/Common/Inputs.js
--- a/cashtab/src/components/Common/Inputs.js
+++ b/cashtab/src/components/Common/Inputs.js
@@ -37,6 +37,7 @@
 `;
 
 const CashtabInput = styled.input`
+    ${props => props.disabled && `cursor: not-allowed`};
     background-color: ${props => props.theme.forms.selectionBackground};
     font-size: 18px;
     padding: 16px 12px;
@@ -66,7 +67,23 @@
     :focus-visible {
         outline: none;
     }
-    height: 142px;
+    height: ${props => props.height}px;
+    resize: none;
+    ${props => props.disabled && `cursor: not-allowed`};
+    &::-webkit-scrollbar {
+        width: 12px;
+    }
+    &::-webkit-scrollbar-track {
+        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+        background-color: ${props => props.theme.eCashBlue};
+        border-radius: 10px;
+        height: 80%;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        color: ${props => props.theme.eCashBlue};
+        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+    }
 `;
 
 const LeftInput = styled(CashtabInput)`
@@ -193,7 +210,7 @@
 `;
 const CountAndErrorFlex = styled.div`
     display: flex;
-    align-items: flex-start;
+    align-items: center;
     justify-content: space-between;
 `;
 const TextAreaErrorMsg = styled.div`
@@ -207,6 +224,8 @@
     name = '',
     value = '',
     handleInput,
+    disabled = false,
+    height = 142,
     error = false,
     showCount = false,
     customCount = false,
@@ -218,6 +237,8 @@
                 placeholder={placeholder}
                 name={name}
                 value={value}
+                height={height}
+                disabled={disabled}
                 onChange={e => handleInput(e)}
             />
             <CountAndErrorFlex>
@@ -242,6 +263,8 @@
     name: PropTypes.string,
     value: PropTypes.string,
     handleInput: PropTypes.func,
+    disabled: PropTypes.bool,
+    height: PropTypes.number,
     error: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
     showCount: PropTypes.bool,
     customCount: PropTypes.number,
@@ -335,7 +358,7 @@
                 <OnMaxBtn
                     onClick={handleOnMax}
                     // Disable the onMax button if the user has fiat selected
-                    disabled={selectValue !== appConfig.ticker}
+                    disabled={selectValue !== appConfig.ticker || inputDisabled}
                 >
                     max
                 </OnMaxBtn>
diff --git a/cashtab/src/components/Common/Switch.js b/cashtab/src/components/Common/Switch.js
--- a/cashtab/src/components/Common/Switch.js
+++ b/cashtab/src/components/Common/Switch.js
@@ -33,12 +33,8 @@
         content: attr(data-on);
         ${props =>
             props.bgImageOn
-                ? `background: ${
-                      props.disabled ? '#ccc' : props.theme.eCashBlue
-                  } url(${props.bgImageOn}) 20%/contain no-repeat`
-                : `background-color: ${
-                      props.disabled ? '#ccc' : props.theme.eCashBlue
-                  }`};
+                ? `background: ${props.theme.eCashBlue} url(${props.bgImageOn}) 20%/contain no-repeat`
+                : `background-color: ${props.theme.eCashBlue}`};
         text-transform: uppercase;
         padding-left: 10px;
         color: #fff;
@@ -132,7 +128,6 @@
                         bgImageOn={bgImageOn}
                         bgImageOff={bgImageOff}
                         bgColorOff={bgColorOff}
-                        disabled={disabled}
                         small={small}
                     ></SwitchInner>
                     <SwitchItself right={right} small={small}></SwitchItself>
diff --git a/cashtab/src/components/Send/SendXec.js b/cashtab/src/components/Send/SendXec.js
--- a/cashtab/src/components/Send/SendXec.js
+++ b/cashtab/src/components/Send/SendXec.js
@@ -17,13 +17,9 @@
     shouldSendXecBeDisabled,
     parseAddressInput,
     isValidXecSendAmount,
+    getOpReturnRawError,
 } from 'validation';
-import {
-    ConvertAmount,
-    AlertMsg,
-    FormLabel,
-    TxLink,
-} from 'components/Common/Atoms';
+import { ConvertAmount, AlertMsg, TxLink } from 'components/Common/Atoms';
 import { getWalletState } from 'utils/cashMethods';
 import {
     sendXec,
@@ -35,6 +31,7 @@
     getAirdropTargetOutput,
     getCashtabMsgByteCount,
     getOpreturnParamTargetOutput,
+    parseOpReturnRaw,
 } from 'opreturn';
 import ApiError from 'components/Common/ApiError';
 import { formatFiatBalance, formatBalance } from 'utils/formatting';
@@ -54,8 +51,10 @@
     TextArea,
 } from 'components/Common/Inputs';
 import Switch from 'components/Common/Switch';
+import { opReturn } from 'config/opreturn';
 
 const SendXecForm = styled.div`
+    margin: 12px 0;
     display: flex;
     flex-direction: column;
     gap: 12px;
@@ -104,6 +103,23 @@
     flex-direction: column;
     justify-content: center;
 `;
+const ParsedOpReturnRawRow = styled.div`
+    display: flex;
+    flex-direction: column;
+    word-break: break-word;
+`;
+const ParsedOpReturnRawLabel = styled.div`
+    color: ${props => props.theme.contrast};
+    text-align: left;
+    width: 100%;
+`;
+const ParsedOpReturnRaw = styled.div`
+    background-color: #fff2f0;
+    border-radius: 12px;
+    color: ${props => props.theme.eCashBlue};
+    padding: 12px;
+    text-align: left;
+`;
 
 const LocaleFormattedValue = styled.div`
     color: ${props => props.theme.contrast};
@@ -114,6 +130,15 @@
 
 const SendToOneHolder = styled.div``;
 const SendToManyHolder = styled.div``;
+const SendToOneInputForm = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+`;
+const InputAndAliasPreviewHolder = styled.div`
+    displaly: flex;
+    flex-direction: column;
+`;
 
 const InputModesHolder = styled.div`
     min-height: 9rem;
@@ -139,15 +164,6 @@
     }
 `;
 
-const AmountSetByBip21Alert = styled.span`
-    color: ${props => props.theme.eCashPurple};
-`;
-const OpReturnRawSetByBip21Alert = styled.div`
-    color: ${props => props.theme.eCashPurple};
-    padding: 12px;
-    overflow-wrap: break-word;
-`;
-
 const SendXec = () => {
     const ContextValue = React.useContext(WalletContext);
     const location = useLocation();
@@ -164,6 +180,12 @@
     );
     const [isOneToManyXECSend, setIsOneToManyXECSend] = useState(false);
     const [sendWithCashtabMsg, setSendWithCashtabMsg] = useState(false);
+    const [sendWithOpReturnRaw, setSendWithOpReturnRaw] = useState(false);
+    const [opReturnRawError, setOpReturnRawError] = useState(false);
+    const [parsedOpReturnRaw, setParsedOpReturnRaw] = useState({
+        protocol: '',
+        data: '',
+    });
 
     // Load with QR code open if device is mobile
     const openWithScanner =
@@ -175,6 +197,7 @@
         multiAddressInput: '',
         airdropTokenId: '',
         cashtabMsg: '',
+        opReturnRaw: '',
     };
 
     const [formData, setFormData] = useState(emptyFormData);
@@ -427,14 +450,9 @@
         } else if (sendWithCashtabMsg && formData.cashtabMsg !== '') {
             // Send this tx with a Cashtab msg if the user has the switch enabled and the input field is not empty
             targetOutputs.push(getCashtabMsgTargetOutput(formData.cashtabMsg));
-        } else if (
-            'op_return_raw' in parsedAddressInput &&
-            parsedAddressInput.op_return_raw.error === false
-        ) {
+        } else if (formData.opReturnRaw !== '' && opReturnRawError === false) {
             targetOutputs.push(
-                getOpreturnParamTargetOutput(
-                    parsedAddressInput.op_return_raw.value,
-                ),
+                getOpreturnParamTargetOutput(formData.opReturnRaw),
             );
         }
 
@@ -583,6 +601,19 @@
             handleAmountChange(amountObj);
         }
 
+        // Set op_return_raw if it's in the query string
+        if ('op_return_raw' in parsedAddressInput) {
+            // Turn on sendWithOpReturnRaw
+            setSendWithOpReturnRaw(true);
+            // Update the op_return_raw field and trigger its validation
+            handleOpReturnRawInput({
+                target: {
+                    name: 'opReturnRaw',
+                    value: parsedAddressInput.op_return_raw.value,
+                },
+            });
+        }
+
         // Set address field to user input
         setFormData(p => ({
             ...p,
@@ -641,6 +672,23 @@
         }));
     };
 
+    const handleOpReturnRawInput = e => {
+        const { name, value } = e.target;
+        // Validate input
+        const error = getOpReturnRawError(value);
+        setOpReturnRawError(error);
+        // Update formdata
+        setFormData(p => ({
+            ...p,
+            [name]: value,
+        }));
+        // Update parsedOpReturn if we have no opReturnRawError
+        if (error === false) {
+            // Need to gate this for no error as parseOpReturnRaw expects a validated op_return_raw
+            setParsedOpReturnRaw(parseOpReturnRaw(value));
+        }
+    };
+
     const handleCashtabMsgChange = e => {
         const { name, value } = e.target;
         let cashtabMsgError = false;
@@ -773,6 +821,8 @@
         multiSendAddressError,
         sendWithCashtabMsg,
         cashtabMsgError,
+        sendWithOpReturnRaw,
+        opReturnRawError,
         priceApiError,
         isOneToManyXECSend,
     );
@@ -821,64 +871,59 @@
             </SwitchContainer>
             <InputModesHolder open={isOneToManyXECSend}>
                 <SendToOneHolder>
-                    <InputWithScanner
-                        placeholder={
-                            aliasSettings.aliasEnabled
-                                ? `Address or Alias`
-                                : `Address`
-                        }
-                        name="address"
-                        value={formData.address}
-                        disabled={txInfoFromUrl !== false}
-                        handleInput={handleAddressChange}
-                        error={sendAddressError}
-                        loadWithScannerOpen={openWithScanner}
-                    />
-                    <AliasAddressPreviewLabel>
-                        <TxLink
-                            key={aliasInputAddress}
-                            data-testid="alias-address-preview"
-                            href={`${explorer.blockExplorerUrl}/address/${aliasInputAddress}`}
-                            target="_blank"
-                            rel="noreferrer"
-                        >
-                            {aliasInputAddress &&
-                                `${aliasInputAddress.slice(
-                                    0,
-                                    10,
-                                )}...${aliasInputAddress.slice(-5)}`}
-                        </TxLink>
-                    </AliasAddressPreviewLabel>
-                    <FormLabel>
-                        {'amount' in parsedAddressInput &&
-                            parsedAddressInput.amount.value !== null && (
-                                <AmountSetByBip21Alert data-testid="bip-alert">
-                                    {' '}
-                                    (set by BIP21 query string)
-                                </AmountSetByBip21Alert>
-                            )}
-                    </FormLabel>
-                    <SendXecInput
-                        name="amount"
-                        value={formData.amount}
-                        selectValue={selectedCurrency}
-                        selectDisabled={
-                            'amount' in parsedAddressInput || txInfoFromUrl
-                        }
-                        inputDisabled={
-                            priceApiError ||
-                            (txInfoFromUrl !== false &&
-                                'value' in txInfoFromUrl &&
-                                txInfoFromUrl.value !== 'null' &&
-                                txInfoFromUrl.value !== 'undefined') ||
-                            'amount' in parsedAddressInput
-                        }
-                        fiatCode={settings.fiatCurrency.toUpperCase()}
-                        error={sendAmountError}
-                        handleInput={handleAmountChange}
-                        handleSelect={handleSelectedCurrencyChange}
-                        handleOnMax={onMax}
-                    />
+                    <SendToOneInputForm>
+                        <InputAndAliasPreviewHolder>
+                            <InputWithScanner
+                                placeholder={
+                                    aliasSettings.aliasEnabled
+                                        ? `Address or Alias`
+                                        : `Address`
+                                }
+                                name="address"
+                                value={formData.address}
+                                disabled={txInfoFromUrl !== false}
+                                handleInput={handleAddressChange}
+                                error={sendAddressError}
+                                loadWithScannerOpen={openWithScanner}
+                            />
+                            <AliasAddressPreviewLabel>
+                                <TxLink
+                                    key={aliasInputAddress}
+                                    data-testid="alias-address-preview"
+                                    href={`${explorer.blockExplorerUrl}/address/${aliasInputAddress}`}
+                                    target="_blank"
+                                    rel="noreferrer"
+                                >
+                                    {aliasInputAddress &&
+                                        `${aliasInputAddress.slice(
+                                            0,
+                                            10,
+                                        )}...${aliasInputAddress.slice(-5)}`}
+                                </TxLink>
+                            </AliasAddressPreviewLabel>
+                        </InputAndAliasPreviewHolder>
+                        <SendXecInput
+                            name="amount"
+                            value={formData.amount}
+                            selectValue={selectedCurrency}
+                            selectDisabled={
+                                'amount' in parsedAddressInput || txInfoFromUrl
+                            }
+                            inputDisabled={
+                                priceApiError ||
+                                (txInfoFromUrl !== false &&
+                                    'value' in txInfoFromUrl &&
+                                    txInfoFromUrl.value !== 'null' &&
+                                    txInfoFromUrl.value !== 'undefined') ||
+                                'amount' in parsedAddressInput
+                            }
+                            fiatCode={settings.fiatCurrency.toUpperCase()}
+                            error={sendAmountError}
+                            handleInput={handleAmountChange}
+                            handleSelect={handleSelectedCurrencyChange}
+                            handleOnMax={onMax}
+                        />
+                    </SendToOneInputForm>
                 </SendToOneHolder>
                 {priceApiError && (
                     <AlertMsg>
@@ -909,12 +954,18 @@
                             checked={sendWithCashtabMsg}
                             disabled={
                                 txInfoFromUrl ||
-                                'queryString' in parsedAddressInput ||
-                                'op_return_raw' in parsedAddressInput
-                            }
-                            handleToggle={() =>
-                                setSendWithCashtabMsg(!sendWithCashtabMsg)
+                                'queryString' in parsedAddressInput
                             }
+                            handleToggle={() => {
+                                // If we are sending a Cashtab msg, toggle off op_return_raw
+                                if (
+                                    !sendWithCashtabMsg &&
+                                    sendWithOpReturnRaw
+                                ) {
+                                    setSendWithOpReturnRaw(false);
+                                }
+                                setSendWithCashtabMsg(!sendWithCashtabMsg);
+                            }}
                         />
                         <SwitchLabel>Cashtab Msg</SwitchLabel>
                     </SwitchAndLabel>
@@ -923,6 +974,7 @@
                     <SendXecRow>
                         <TextArea
                             name="cashtabMsg"
+                            height={62}
                             placeholder={`Include a public Cashtab msg with this tx ${
                                 location &&
                                 location.state &&
@@ -954,6 +1006,64 @@
                         />
                     </SendXecRow>
                 )}
+                <SendXecRow>
+                    <SwitchAndLabel>
+                        <Switch
+                            name="opreturnraw-switch"
+                            checked={sendWithOpReturnRaw}
+                            disabled={
+                                txInfoFromUrl ||
+                                'queryString' in parsedAddressInput
+                            }
+                            handleToggle={() => {
+                                // If we are sending with op_return_raw, toggle off CashtabMsg
+                                if (
+                                    !sendWithOpReturnRaw &&
+                                    sendWithCashtabMsg
+                                ) {
+                                    setSendWithCashtabMsg(false);
+                                }
+                                setSendWithOpReturnRaw(!sendWithOpReturnRaw);
+                            }}
+                        />
+                        <SwitchLabel>op_return_raw</SwitchLabel>
+                    </SwitchAndLabel>
+                </SendXecRow>
+                {sendWithOpReturnRaw && (
+                    <>
+                        <SendXecRow>
+                            <TextArea
+                                name="opReturnRaw"
+                                height={62}
+                                placeholder={`(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`}
+                                value={formData.opReturnRaw}
+                                error={opReturnRawError}
+                                disabled={
+                                    txInfoFromUrl ||
+                                    'queryString' in parsedAddressInput
+                                }
+                                showCount
+                                max={2 * opReturn.opreturnParamByteLimit}
+                                handleInput={handleOpReturnRawInput}
+                            />
+                        </SendXecRow>
+                        {opReturnRawError === false &&
+                            formData.parsedOpReturnRaw !== '' && (
+                                <SendXecRow>
+                                    <ParsedOpReturnRawRow>
+                                        <ParsedOpReturnRawLabel>
+                                            Parsed op_return_raw
+                                        </ParsedOpReturnRawLabel>
+                                        <ParsedOpReturnRaw>
+                                            <b>{parsedOpReturnRaw.protocol}</b>
+                                            <br />
+                                            {parsedOpReturnRaw.data}
+                                        </ParsedOpReturnRaw>
+                                    </ParsedOpReturnRawRow>
+                                </SendXecRow>
+                            )}
+                    </>
+                )}
             </SendXecForm>
 
             <AmountPreviewCtn>
@@ -983,13 +1093,6 @@
                     </>
                 )}
             </AmountPreviewCtn>
-            {'op_return_raw' in parsedAddressInput && (
-                <OpReturnRawSetByBip21Alert data-testid="op-return-raw-set-alert">
-                    Hex OP_RETURN &quot;
-                    {parsedAddressInput.op_return_raw.value}
-                    &quot; set by BIP21
-                </OpReturnRawSetByBip21Alert>
-            )}
             <PrimaryButton
                 style={{ marginTop: '12px' }}
                 data-testid="send-it"
diff --git a/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js b/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
--- a/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
+++ b/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
@@ -130,11 +130,6 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Wait for balance to be loaded
         expect(await screen.findByText('9,513.12 XEC')).toBeInTheDocument();
 
@@ -204,11 +199,6 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is not disabled because we have a valid amount
         expect(
             await screen.findByRole('button', { name: /Send/ }),
@@ -273,11 +263,6 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled because no amount is entered
         expect(await screen.findByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
@@ -342,11 +327,6 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled because no amount is entered
         expect(await screen.findByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
@@ -404,11 +384,6 @@
         // The "Webapp Tx Request" notice is NOT rendered
         expect(screen.queryByText('Webapp Tx Request')).not.toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled because no amount is entered
         expect(await screen.findByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
@@ -468,11 +443,6 @@
         // The "Webapp Tx Request" notice is NOT rendered
         expect(screen.queryByText('Webapp Tx Request')).not.toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled because no amount is entered
         expect(await screen.findByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
@@ -538,11 +508,6 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is not disabled because we have a valid amount
         expect(
             await screen.findByRole('button', { name: /Send/ }),
@@ -562,7 +527,7 @@
             'ecash:qp33mh3a7qq7p8yulhnvwty2uq5ynukqcvuxmvzfhm';
         const amount = 17;
         const op_return_raw =
-            '04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177';
+            '04007461622263617368746162206d6573736167652077697468206f705f72657475726e5f726177';
         const bip21Str = `${destinationAddress}?amount=${amount}&op_return_raw=${op_return_raw}`;
         const hash = `#/send?bip21=${bip21Str}`;
         // ?bip21=ecash:qp33mh3a7qq7p8yulhnvwty2uq5ynukqcvuxmvzfhm?amount=17&op_return_raw=04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177
@@ -616,6 +581,16 @@
         // The amount input is disabled because it is set by a bip21 query string
         expect(amountInputEl).toHaveProperty('disabled', true);
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
         // No addr validation errors on load
         for (const addrErr of SEND_ADDRESS_VALIDATION_ERRORS) {
             expect(screen.queryByText(addrErr)).not.toBeInTheDocument();
@@ -625,6 +600,23 @@
             expect(screen.queryByText(amountErr)).not.toBeInTheDocument();
         }
 
+        // The op_return_raw switch is disabled because we have txInfoFromUrl
+        expect(screen.getByTestId('opreturnraw-switch')).toHaveProperty(
+            'disabled',
+            true,
+        );
+
+        // The op_return_raw switch is checked because it is set by txInfoFromUrl
+        expect(screen.getByTestId('opreturnraw-switch')).toHaveProperty(
+            'checked',
+            true,
+        );
+
+        // We see the preview of this op_return_raw
+        expect(
+            screen.getByText('cashtab message with op_return_raw'),
+        ).toBeInTheDocument();
+
         // The Send button is enabled as we have valid address and amount params
         expect(
             await screen.findByRole('button', { name: /Send/ }),
@@ -633,32 +625,18 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because we have txInfoFromUrl
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
-
-        // The Bip21Alert op_return_raw span is rendered
-        const opReturnRawAlert = screen.getByTestId('op-return-raw-set-alert');
-        expect(opReturnRawAlert).toBeInTheDocument();
-
-        // Alert renders the set hex string
-        expect(opReturnRawAlert).toHaveTextContent(
-            `Hex OP_RETURN "${op_return_raw}" set by BIP21`,
-        );
     });
     it('bip21 param - an invalid bip21 param shows validation errors but cannot be changed', async () => {
         const destinationAddress =
             'ecash:qp33mh3a7qq7p8yulhnvwty2uq5ynukqcvuxmvzfhm';
         const amount = 17;
         const op_return_raw =
-            '04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177';
+            '04007461622263617368746162206d6573736167652077697468206f705f72657475726e5f726177';
         // Repeat the op_return_raw param
         const bip21Str = `${destinationAddress}?amount=${amount}&op_return_raw=${op_return_raw}&op_return_raw=${op_return_raw}`;
         const hash = `#/send?bip21=${bip21Str}`;
@@ -715,10 +693,7 @@
 
         // We get the expected validation error
         expect(
-            // Note that, due to antd quirks, we get 2 of these
-            screen.getAllByText(
-                'bip21 parameters may not appear more than once',
-            )[0],
+            screen.getByText('bip21 parameters may not appear more than once'),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -729,22 +704,11 @@
         // The "Webapp Tx Request" notice is rendered
         expect(screen.getByText('Webapp Tx Request')).toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered as no info about the tx is set for invalid bip21
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because we have txInfoFromUrl
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
-
-        // The Bip21Alert op_return_raw span is not rendered as the bip21 query string is invalid
-        const opReturnRawAlert = screen.queryByTestId(
-            'op-return-raw-set-alert',
-        );
-        expect(opReturnRawAlert).not.toBeInTheDocument();
     });
     it('No params. Send screen loads normally with no rendered input.', async () => {
         const hash = `#/send`;
@@ -788,11 +752,6 @@
         // The "Webapp Tx Request" notice is NOT rendered
         expect(screen.queryByText('Webapp Tx Request')).not.toBeInTheDocument();
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled
         expect(await screen.findByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
diff --git a/cashtab/src/components/Send/__tests__/SendXec.test.js b/cashtab/src/components/Send/__tests__/SendXec.test.js
--- a/cashtab/src/components/Send/__tests__/SendXec.test.js
+++ b/cashtab/src/components/Send/__tests__/SendXec.test.js
@@ -114,11 +114,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Send button is disabled
         expect(screen.getByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
@@ -163,11 +158,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -237,11 +227,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -301,11 +286,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -313,8 +293,7 @@
         expect(amountInputEl).toHaveProperty('disabled', false);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
-        expect(screen.getAllByText('Invalid address')[0]).toBeInTheDocument();
+        expect(screen.getByText('Invalid address')).toBeInTheDocument();
 
         // The Send button is disabled
         expect(screen.getByRole('button', { name: /Send/ })).toHaveStyle(
@@ -350,11 +329,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -362,9 +336,8 @@
         expect(amountInputEl).toHaveProperty('disabled', false);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(`Aliases must end with '.xec'`)[0],
+            screen.getByText(`Aliases must end with '.xec'`),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -419,11 +392,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -431,11 +399,10 @@
         expect(amountInputEl).toHaveProperty('disabled', false);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(
+            screen.getByText(
                 `eCash Alias does not exist or yet to receive 1 confirmation`,
-            )[0],
+            ),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -483,11 +450,6 @@
             false,
         );
 
-        // The Bip21Alert span is not rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // Amount input is untouched
         expect(amountInputEl).toHaveValue(null);
 
@@ -495,11 +457,10 @@
         expect(amountInputEl).toHaveProperty('disabled', false);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(
+            screen.getByText(
                 `Error resolving alias at indexer, contact admin.`,
-            )[0],
+            ),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -556,11 +517,6 @@
         expect(screen.getByRole('button', { name: /Send/ })).not.toHaveStyle(
             'cursor: not-allowed',
         );
-
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
     });
     it('Pass a valid alias and bip21 query string with valid amount param to Send To field', async () => {
         // Mock the app with context at the Send screen
@@ -631,11 +587,6 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The alias address preview renders the expected address preview
         expect(
             screen.getByText(
@@ -677,9 +628,8 @@
         expect(amountInputEl).toHaveProperty('disabled', true);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(`Send amount must be at least 5.5 XEC`)[0],
+            screen.getByText(`Send amount must be at least 5.5 XEC`),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -687,11 +637,6 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The "Send to Many" switch is disabled
         expect(screen.getByTestId('send-to-many-switch')).toHaveProperty(
             'disabled',
@@ -729,11 +674,10 @@
         expect(amountInputEl).toHaveProperty('disabled', true);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(
+            screen.getByText(
                 `Amount 1,000,000.00 XEC exceeds wallet balance of 9,513.12 XEC`,
-            )[0],
+            ),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -741,11 +685,6 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The "Send to Many" switch is disabled
         expect(screen.getByTestId('send-to-many-switch')).toHaveProperty(
             'disabled',
@@ -804,11 +743,10 @@
         expect(amountInputEl).toHaveProperty('disabled', true);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(
+            screen.getByText(
                 `XEC transactions do not support more than 2 decimal places`,
-            )[0],
+            ),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -816,11 +754,6 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The "Send to Many" switch is disabled
         expect(screen.getByTestId('send-to-many-switch')).toHaveProperty(
             'disabled',
@@ -874,9 +807,8 @@
         expect(amountInputEl).toHaveProperty('disabled', false);
 
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(`Unsupported param "notaparam"`)[0],
+            screen.getByText(`Unsupported param "notaparam"`),
         ).toBeInTheDocument();
 
         // The Send button is disabled
@@ -884,11 +816,6 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is NOT rendered
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because we have a querystring address input
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
@@ -912,8 +839,8 @@
         const amountInputEl = screen.getByPlaceholderText('Amount');
 
         // The user enters a valid BIP21 query string with a valid amount param
-        const addressInput =
-            'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?op_return_raw=0401020304';
+        const op_return_raw = '0401020304';
+        const addressInput = `ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?op_return_raw=${op_return_raw}`;
         await user.type(addressInputEl, addressInput);
 
         // The 'Send To' input field has this address as a value
@@ -940,26 +867,26 @@
             expect(screen.queryByText(amountErr)).not.toBeInTheDocument();
         }
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
         // The Send button is disabled because amount is not entered
         expect(screen.getByRole('button', { name: /Send/ })).toHaveStyle(
             'cursor: not-allowed',
         );
 
-        // The amount set by Bip21Alert span is NOT rendered as the amount is not set by bip21
-        expect(
-            screen.queryByText('(set by BIP21 query string)'),
-        ).not.toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because op_return_raw is set
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
-
-        // The Bip21Alert op_return_raw span is rendered
-        expect(
-            screen.getByText(`Hex OP_RETURN "0401020304" set by BIP21`),
-        ).toBeInTheDocument();
     });
     it('Pass a valid address and bip21 query string with valid amount and op_return_raw params to Send To field', async () => {
         // Mock the app with context at the Send screen
@@ -978,8 +905,8 @@
         const amountInputEl = screen.getByPlaceholderText('Amount');
 
         // The user enters a valid BIP21 query string with a valid amount param
-        const addressInput =
-            'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=500&op_return_raw=0401020304';
+        const op_return_raw = '0401020304';
+        const addressInput = `ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=500&op_return_raw=${op_return_raw}`;
         await user.type(addressInputEl, addressInput);
 
         // The 'Send To' input field has this address as a value
@@ -1006,26 +933,26 @@
             expect(screen.queryByText(amountErr)).not.toBeInTheDocument();
         }
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
         // The Send button is enabled as we have valid address and amount params
         expect(screen.getByRole('button', { name: /Send/ })).not.toHaveStyle(
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because op_return_raw is set
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
-
-        // The Bip21Alert op_return_raw span is rendered
-        expect(
-            screen.getByText(`Hex OP_RETURN "0401020304" set by BIP21`),
-        ).toBeInTheDocument();
     });
     it('Pass a valid address and bip21 query string with valid amount and invalid op_return_raw params to Send To field', async () => {
         // Mock the app with context at the Send screen
@@ -1043,9 +970,9 @@
         const addressInputEl = screen.getByPlaceholderText('Address');
         const amountInputEl = screen.getByPlaceholderText('Amount');
 
-        // The user enters a valid BIP21 query string with a valid amount param
-        const addressInput =
-            'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=500&op_return_raw=notahexstring';
+        // The user enters a valid BIP21 query string with a valid amount param and invalid op_return_raw
+        const op_return_raw = 'notahexstring';
+        const addressInput = `ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=500&op_return_raw=${op_return_raw}`;
         await user.type(addressInputEl, addressInput);
 
         // The 'Send To' input field has this address as a value
@@ -1063,12 +990,19 @@
         // The amount input is disabled because it is set by a bip21 query string
         expect(amountInputEl).toHaveProperty('disabled', true);
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
         // We get expected addr validation error
-        // Due to antd quirks, we get multiple elements with this
         expect(
-            screen.getAllByText(
-                `Invalid op_return_raw param "notahexstring"`,
-            )[0],
+            screen.getByText('Input must be lowercase hex a-f 0-9.'),
         ).toBeInTheDocument();
 
         // The Send button is disabled as we have valid address and amount params
@@ -1076,21 +1010,11 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because op_return_raw is set
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
-
-        // The Bip21Alert op_return_raw span is rendered
-        expect(
-            screen.getByText(`Hex OP_RETURN "notahexstring" set by BIP21`),
-        ).toBeInTheDocument();
     });
     it('Clicking "Send" will send a valid tx with op_return_raw after entry of a valid address and bip21 query string with valid amount and op_return_raw params to Send To field', async () => {
         // Mock the app with context at the Send screen
@@ -1119,8 +1043,9 @@
         const addressInputEl = screen.getByPlaceholderText('Address');
         const amountInputEl = screen.getByPlaceholderText('Amount');
         // The user enters a valid BIP21 query string with a valid amount param
-        const addressInput =
-            'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=17&op_return_raw=04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177';
+        const op_return_raw =
+            '04007461622263617368746162206d6573736167652077697468206f705f72657475726e5f726177';
+        const addressInput = `ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=17&op_return_raw=${op_return_raw}`;
         await user.type(addressInputEl, addressInput);
 
         // The 'Send To' input field has this address as a value
@@ -1141,6 +1066,21 @@
         // The amount input is disabled because it is set by a bip21 query string
         expect(amountInputEl).toHaveProperty('disabled', true);
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
+        // We see expected data in the op_return_raw preview
+        expect(
+            screen.getByText('cashtab message with op_return_raw'),
+        ).toBeInTheDocument();
+
         // No addr validation errors on load
         for (const addrErr of SEND_ADDRESS_VALIDATION_ERRORS) {
             expect(screen.queryByText(addrErr)).not.toBeInTheDocument();
@@ -1155,24 +1095,12 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because op_return_raw is set
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
 
-        // The Bip21Alert op_return_raw span is rendered
-        expect(
-            screen.getByText(
-                `Hex OP_RETURN "04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177" set by BIP21`,
-            ),
-        ).toBeInTheDocument();
-
         // Click Send
         await user.click(
             screen.getByRole('button', { name: /Send/ }),
@@ -1347,8 +1275,9 @@
         const addressInputEl = screen.getByPlaceholderText('Address');
         const amountInputEl = screen.getByPlaceholderText('Amount');
         // The user enters a valid BIP21 query string with a valid amount param
-        const addressInput =
-            'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=17&op_return_raw=04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177';
+        const op_return_raw =
+            '04007461622263617368746162206d6573736167652077697468206f705f72657475726e5f726177';
+        const addressInput = `ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6?amount=17&op_return_raw=${op_return_raw}`;
         await user.type(addressInputEl, addressInput);
 
         // The 'Send To' input field has this address as a value
@@ -1369,6 +1298,16 @@
         // The amount input is disabled because it is set by a bip21 query string
         expect(amountInputEl).toHaveProperty('disabled', true);
 
+        const opReturnRawInput = screen.getByPlaceholderText(
+            `(Advanced) Enter raw hex to be included with this transaction's OP_RETURN`,
+        );
+
+        // The op_return_raw input is populated with this op_return_raw
+        expect(opReturnRawInput).toHaveValue(op_return_raw);
+
+        // The op_return_raw input is disabled
+        expect(opReturnRawInput).toHaveProperty('disabled', true);
+
         // No addr validation errors on load
         for (const addrErr of SEND_ADDRESS_VALIDATION_ERRORS) {
             expect(screen.queryByText(addrErr)).not.toBeInTheDocument();
@@ -1383,24 +1322,12 @@
             'cursor: not-allowed',
         );
 
-        // The Bip21Alert span is rendered
-        expect(
-            screen.getByText('(set by BIP21 query string)'),
-        ).toBeInTheDocument();
-
         // The Cashtab Msg switch is disabled because op_return_raw is set
         expect(screen.getByTestId('cashtab-msg-switch')).toHaveProperty(
             'disabled',
             true,
         );
 
-        // The Bip21Alert op_return_raw span is rendered
-        expect(
-            screen.getByText(
-                `Hex OP_RETURN "04007461622263617368746162206D6573736167652077697468206F705F72657475726E5F726177" set by BIP21`,
-            ),
-        ).toBeInTheDocument();
-
         // Click Send
         await user.click(
             screen.getByRole('button', { name: /Send/ }),
diff --git a/cashtab/src/opreturn/__tests__/index.test.js b/cashtab/src/opreturn/__tests__/index.test.js
--- a/cashtab/src/opreturn/__tests__/index.test.js
+++ b/cashtab/src/opreturn/__tests__/index.test.js
@@ -9,155 +9,187 @@
     getAliasByteCount,
     getCashtabMsgByteCount,
     getOpreturnParamTargetOutput,
+    parseOpReturnRaw,
 } from 'opreturn';
 import { opReturnVectors } from '../fixtures/vectors';
 
-describe('Cashtab Msg building functions', () => {
-    const { expectedReturns, expectedErrors } = opReturnVectors.cashtabMsgs;
+describe('Cashtab opreturn methods', () => {
+    describe('Cashtab Msg building functions', () => {
+        const { expectedReturns, expectedErrors } = opReturnVectors.cashtabMsgs;
 
-    // Successfully created targetOutputs
-    expectedReturns.forEach(expectedReturn => {
-        const { description, cashtabMsg, outputScriptHex } = expectedReturn;
-        it(`getCashtabMsgTargetOutput: ${description}`, () => {
-            const targetOutput = getCashtabMsgTargetOutput(cashtabMsg);
-            // Output value should be zero for OP_RETURN
-            expect(targetOutput.value).toStrictEqual(0);
-            // Test vs hex string as cannot store buffer type in vectors
-            expect(targetOutput.script.toString('hex')).toStrictEqual(
-                outputScriptHex,
-            );
+        // Successfully created targetOutputs
+        expectedReturns.forEach(expectedReturn => {
+            const { description, cashtabMsg, outputScriptHex } = expectedReturn;
+            it(`getCashtabMsgTargetOutput: ${description}`, () => {
+                const targetOutput = getCashtabMsgTargetOutput(cashtabMsg);
+                // Output value should be zero for OP_RETURN
+                expect(targetOutput.value).toStrictEqual(0);
+                // Test vs hex string as cannot store buffer type in vectors
+                expect(targetOutput.script.toString('hex')).toStrictEqual(
+                    outputScriptHex,
+                );
+            });
         });
-    });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, cashtabMsg, errorMsg } = expectedError;
-        it(`getCashtabMsgTargetOutput throws error for: ${description}`, () => {
-            expect(() => getCashtabMsgTargetOutput(cashtabMsg)).toThrow(
-                errorMsg,
-            );
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, cashtabMsg, errorMsg } = expectedError;
+            it(`getCashtabMsgTargetOutput throws error for: ${description}`, () => {
+                expect(() => getCashtabMsgTargetOutput(cashtabMsg)).toThrow(
+                    errorMsg,
+                );
+            });
         });
     });
-});
 
-describe('getAirdropTargetOutput', () => {
-    const { expectedReturns, expectedErrors } = opReturnVectors.airdrops;
+    describe('getAirdropTargetOutput', () => {
+        const { expectedReturns, expectedErrors } = opReturnVectors.airdrops;
 
-    // Successfully created targetOutputs
-    expectedReturns.forEach(expectedReturn => {
-        const { description, tokenId, airdropMsg, outputScriptHex } =
-            expectedReturn;
-        it(`${description}`, () => {
-            const targetOutput = getAirdropTargetOutput(tokenId, airdropMsg);
-            // Output value should be zero for OP_RETURN
-            expect(targetOutput.value).toStrictEqual(0);
-            // Test vs hex string as cannot store buffer type in vectors
-            expect(targetOutput.script.toString('hex')).toStrictEqual(
-                outputScriptHex,
-            );
+        // Successfully created targetOutputs
+        expectedReturns.forEach(expectedReturn => {
+            const { description, tokenId, airdropMsg, outputScriptHex } =
+                expectedReturn;
+            it(`${description}`, () => {
+                const targetOutput = getAirdropTargetOutput(
+                    tokenId,
+                    airdropMsg,
+                );
+                // Output value should be zero for OP_RETURN
+                expect(targetOutput.value).toStrictEqual(0);
+                // Test vs hex string as cannot store buffer type in vectors
+                expect(targetOutput.script.toString('hex')).toStrictEqual(
+                    outputScriptHex,
+                );
+            });
         });
-    });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, tokenId, airdropMsg, errorMsg } = expectedError;
-        it(`getAirdropTargetOutput throws error for: ${description}`, () => {
-            expect(() => getAirdropTargetOutput(tokenId, airdropMsg)).toThrow(
-                errorMsg,
-            );
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, tokenId, airdropMsg, errorMsg } =
+                expectedError;
+            it(`getAirdropTargetOutput throws error for: ${description}`, () => {
+                expect(() =>
+                    getAirdropTargetOutput(tokenId, airdropMsg),
+                ).toThrow(errorMsg);
+            });
         });
     });
-});
 
-describe('Alias registration target output building functions', () => {
-    const { expectedReturns, expectedErrors } =
-        opReturnVectors.aliasRegistrations;
+    describe('Alias registration target output building functions', () => {
+        const { expectedReturns, expectedErrors } =
+            opReturnVectors.aliasRegistrations;
 
-    // Successfully created targetOutputs
-    expectedReturns.forEach(expectedReturn => {
-        const { description, alias, address, outputScriptHex } = expectedReturn;
-        it(`getAliasTargetOutput: ${description}`, () => {
-            const targetOutput = getAliasTargetOutput(alias, address);
-            // Output value should be zero for OP_RETURN
-            expect(targetOutput.value).toStrictEqual(0);
-            // Test vs hex string as cannot store buffer type in vectors
-            expect(targetOutput.script.toString('hex')).toStrictEqual(
-                outputScriptHex,
-            );
+        // Successfully created targetOutputs
+        expectedReturns.forEach(expectedReturn => {
+            const { description, alias, address, outputScriptHex } =
+                expectedReturn;
+            it(`getAliasTargetOutput: ${description}`, () => {
+                const targetOutput = getAliasTargetOutput(alias, address);
+                // Output value should be zero for OP_RETURN
+                expect(targetOutput.value).toStrictEqual(0);
+                // Test vs hex string as cannot store buffer type in vectors
+                expect(targetOutput.script.toString('hex')).toStrictEqual(
+                    outputScriptHex,
+                );
+            });
         });
-    });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, alias, address, errorMsg } = expectedError;
-        it(`getAliasTargetOutput throws error for: ${description}`, () => {
-            expect(() => getAliasTargetOutput(alias, address)).toThrow(
-                errorMsg,
-            );
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, alias, address, errorMsg } = expectedError;
+            it(`getAliasTargetOutput throws error for: ${description}`, () => {
+                expect(() => getAliasTargetOutput(alias, address)).toThrow(
+                    errorMsg,
+                );
+            });
         });
     });
-});
 
-describe('Determines byte count of user input alias registrations', () => {
-    const { expectedReturns, expectedErrors } = opReturnVectors.aliasByteCounts;
+    describe('Determines byte count of user input alias registrations', () => {
+        const { expectedReturns, expectedErrors } =
+            opReturnVectors.aliasByteCounts;
 
-    // Successfully calculates alias bytecounts
-    expectedReturns.forEach(expectedReturn => {
-        const { description, alias, byteCount } = expectedReturn;
-        it(`getAliasByteCount: ${description}`, () => {
-            expect(getAliasByteCount(alias)).toBe(byteCount);
+        // Successfully calculates alias bytecounts
+        expectedReturns.forEach(expectedReturn => {
+            const { description, alias, byteCount } = expectedReturn;
+            it(`getAliasByteCount: ${description}`, () => {
+                expect(getAliasByteCount(alias)).toBe(byteCount);
+            });
         });
-    });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, alias, errorMsg } = expectedError;
-        it(`getAliasByteCount throws error for: ${description}`, () => {
-            expect(() => getAliasByteCount(alias)).toThrow(errorMsg);
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, alias, errorMsg } = expectedError;
+            it(`getAliasByteCount throws error for: ${description}`, () => {
+                expect(() => getAliasByteCount(alias)).toThrow(errorMsg);
+            });
         });
     });
-});
 
-describe('Determines bytecount of user input Cashtab Msg', () => {
-    const { expectedReturns, expectedErrors } =
-        opReturnVectors.cashtabMsgByteCounts;
+    describe('Determines bytecount of user input Cashtab Msg', () => {
+        const { expectedReturns, expectedErrors } =
+            opReturnVectors.cashtabMsgByteCounts;
 
-    // Successfully calculates Cashtab Msg bytecounts
-    expectedReturns.forEach(expectedReturn => {
-        const { description, cashtabMsg, byteCount } = expectedReturn;
-        it(`getCashtabMsgByteCount: ${description}`, () => {
-            expect(getCashtabMsgByteCount(cashtabMsg)).toBe(byteCount);
+        // Successfully calculates Cashtab Msg bytecounts
+        expectedReturns.forEach(expectedReturn => {
+            const { description, cashtabMsg, byteCount } = expectedReturn;
+            it(`getCashtabMsgByteCount: ${description}`, () => {
+                expect(getCashtabMsgByteCount(cashtabMsg)).toBe(byteCount);
+            });
         });
-    });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, cashtabMsg, errorMsg } = expectedError;
-        it(`getCashtabMsgByteCount throws error for: ${description}`, () => {
-            expect(() => getCashtabMsgByteCount(cashtabMsg)).toThrow(errorMsg);
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, cashtabMsg, errorMsg } = expectedError;
+            it(`getCashtabMsgByteCount throws error for: ${description}`, () => {
+                expect(() => getCashtabMsgByteCount(cashtabMsg)).toThrow(
+                    errorMsg,
+                );
+            });
         });
     });
-});
 
-describe('Build target output for opreturn as bip21 param', () => {
-    const { expectedReturns, expectedErrors } =
-        opReturnVectors.opreturnsAsParam;
+    describe('Build target output for opreturn as bip21 param', () => {
+        const { expectedReturns, expectedErrors } =
+            opReturnVectors.opreturnsAsParam;
 
-    // Successfully created targetOutputs
-    expectedReturns.forEach(expectedReturn => {
-        const { description, opreturnParam, outputScriptHex } = expectedReturn;
-        it(`getOpreturnParamTargetOutput: ${description}`, () => {
-            const targetOutput = getOpreturnParamTargetOutput(opreturnParam);
-            // Output value should be zero for OP_RETURN
-            expect(targetOutput.value).toStrictEqual(0);
-            // Test vs hex string as cannot store buffer type in vectors
-            expect(targetOutput.script.toString('hex')).toStrictEqual(
-                outputScriptHex,
-            );
+        // Successfully created targetOutputs
+        expectedReturns.forEach(expectedReturn => {
+            const { description, opreturnParam, outputScriptHex } =
+                expectedReturn;
+            it(`getOpreturnParamTargetOutput: ${description}`, () => {
+                const targetOutput =
+                    getOpreturnParamTargetOutput(opreturnParam);
+                // Output value should be zero for OP_RETURN
+                expect(targetOutput.value).toStrictEqual(0);
+                // Test vs hex string as cannot store buffer type in vectors
+                expect(targetOutput.script.toString('hex')).toStrictEqual(
+                    outputScriptHex,
+                );
+            });
+        });
+        // Error cases
+        expectedErrors.forEach(expectedError => {
+            const { description, opreturnParam, errorMsg } = expectedError;
+            it(`getOpreturnParamTargetOutput throws error for: ${description}`, () => {
+                expect(() =>
+                    getOpreturnParamTargetOutput(opreturnParam),
+                ).toThrow(errorMsg);
+            });
         });
     });
-    // Error cases
-    expectedErrors.forEach(expectedError => {
-        const { description, opreturnParam, errorMsg } = expectedError;
-        it(`getOpreturnParamTargetOutput throws error for: ${description}`, () => {
-            expect(() => getOpreturnParamTargetOutput(opreturnParam)).toThrow(
-                errorMsg,
-            );
+    describe('Parse op_return_raw input for display on Send screen', () => {
+        const { expectedReturns, expectedErrors } =
+            opReturnVectors.parseOpReturnRaw;
+
+        // Successfully created targetOutputs
+        expectedReturns.forEach(expectedReturn => {
+            const { description, opReturnRaw, returned } = expectedReturn;
+            it(`parseOpReturnRaw: ${description}`, () => {
+                // Output value should be zero for OP_RETURN
+                expect(parseOpReturnRaw(opReturnRaw)).toStrictEqual(returned);
+            });
+        });
+        expectedErrors.forEach(expectedError => {
+            const { description, opReturnRaw, error } = expectedError;
+            it(`parseOpReturnRaw throws error for: ${description}`, () => {
+                expect(() => parseOpReturnRaw(opReturnRaw)).toThrow(error);
+            });
         });
     });
 });
diff --git a/cashtab/src/opreturn/fixtures/vectors.js b/cashtab/src/opreturn/fixtures/vectors.js
--- a/cashtab/src/opreturn/fixtures/vectors.js
+++ b/cashtab/src/opreturn/fixtures/vectors.js
@@ -279,4 +279,168 @@
             },
         ],
     },
+    parseOpReturnRaw: {
+        expectedReturns: [
+            {
+                description:
+                    'Returns protocol identifier and raw hex for an SLP tx',
+                opReturnRaw:
+                    '04534c500001010453454e44206f703bffa22803003c2e69af42c2b765e107ac30fcd516b95d0e00e5f668d0e308000000000000006408000000e8d4a4f318',
+                returned: {
+                    protocol: 'SLP',
+                    data: '04534c500001010453454e44206f703bffa22803003c2e69af42c2b765e107ac30fcd516b95d0e00e5f668d0e308000000000000006408000000e8d4a4f318',
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and decoded message for a valid Cashtab msg',
+                opReturnRaw:
+                    '0400746162356c6574277320676f6f6f6f6f6f6f206543617368203d20656c656374726f6e696320436173680a58e3858ce384b7757272656e6379',
+                returned: {
+                    protocol: 'Cashtab Msg',
+                    data: `let's gooooooo eCash = electronic Cash\nXㅌㄷurrency`,
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and decoded message for an invalid Cashtab msg',
+                opReturnRaw: '0400746162',
+                returned: {
+                    protocol: 'Invalid Cashtab Msg',
+                    data: '0400746162',
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and decoded message for an encrypted Cashtab msg',
+                opReturnRaw: '04657461620101',
+                returned: {
+                    protocol: 'Encrypted Cashtab Msg',
+                    data: '04657461620101',
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and tokenId for a valid airdrop with no msg',
+                opReturnRaw:
+                    '0464726f7020b76878b29eff39c8c28aaed7d18a166c20057c43beeb90b630264470983c984a',
+                returned: {
+                    protocol: 'Airdrop',
+                    data: `Token ID: b76878b29eff39c8c28aaed7d18a166c20057c43beeb90b630264470983c984a`,
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and tokenId for a valid airdrop with msg',
+                opReturnRaw:
+                    '0464726f70209881f13f23babd28f37901003cc9dc3f84549496d3ff6c8a34c26deac5134fd94357656c636f6d652056696e6e61204c696d206a6f696e2023313635204d616c617973696120652e4361736820436f6d6d756e69747920436c6173736963205061737321',
+                returned: {
+                    protocol: 'Airdrop',
+                    data: `Token ID: 9881f13f23babd28f37901003cc9dc3f84549496d3ff6c8a34c26deac5134fd9\nMsg: Welcome Vinna Lim join #165 Malaysia e.Cash Community Classic Pass!`,
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and raw hex for invalid airdrop',
+                opReturnRaw: '0464726f70',
+                returned: {
+                    protocol: 'Invalid Airdrop',
+                    data: `0464726f70`,
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and raw hex for valid alias registration',
+                opReturnRaw:
+                    '042e786563000c746573747465737474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
+                returned: {
+                    protocol: 'Alias Registration',
+                    data: `testtesttest to ecash:qqy4u704r4pxp0qdcwa8ldmu005j6raa6ys060u0ns`,
+                },
+            },
+            {
+                description:
+                    'Returns protocol identifier and raw hex for invalid alias registration',
+                opReturnRaw:
+                    // bad address type
+                    '042e786563000c746573747465737474657374150395e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
+                returned: {
+                    protocol: 'Invalid Alias Registration',
+                    data: `042e786563000c746573747465737474657374150395e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d`,
+                },
+            },
+            {
+                description: 'Valid paybutton with data and nonce',
+                opReturnRaw: '0450415900000474657374080102030405060708',
+                returned: {
+                    protocol: 'PayButton',
+                    data: 'Data: test, Nonce: 0102030405060708',
+                },
+            },
+            {
+                description: 'Valid paybutton with no data and nonce',
+                opReturnRaw: '04504159000000080102030405060708',
+                returned: {
+                    protocol: 'PayButton',
+                    data: 'Nonce: 0102030405060708',
+                },
+            },
+            {
+                description: 'Valid paybutton with data and no nonce',
+                opReturnRaw: '045041590000047465737400',
+                returned: {
+                    protocol: 'PayButton',
+                    data: 'Data: test',
+                },
+            },
+            {
+                description: 'Valid empty paybutton',
+                opReturnRaw: '0450415900000000',
+                returned: {
+                    protocol: 'PayButton',
+                    data: '',
+                },
+            },
+            {
+                description: 'Invalid paybutton',
+                opReturnRaw: '045041590000',
+                returned: {
+                    protocol: 'Invalid PayButton',
+                    data: '045041590000',
+                },
+            },
+            {
+                description: 'Valid eCash chat',
+                opReturnRaw: '046368617409746573742063686174',
+                returned: {
+                    protocol: 'eCash Chat',
+                    data: 'test chat',
+                },
+            },
+            {
+                description: 'Invalid eCash chat',
+                opReturnRaw: '0463686174',
+                returned: {
+                    protocol: 'Invalid eCash Chat',
+                    data: '0463686174',
+                },
+            },
+            {
+                description: 'Returns unknown for unknown OP_RETURN',
+                opReturnRaw: '04deadbeef',
+                returned: {
+                    protocol: 'Unknown Protocol',
+                    data: '04deadbeef',
+                },
+            },
+        ],
+        expectedErrors: [
+            {
+                description:
+                    'Throws error if op_return_raw is invalid OP_RETURN',
+                opReturnRaw: 'deadbeef',
+                error: new Error('Invalid OP_RETURN'),
+            },
+        ],
+    },
 };
diff --git a/cashtab/src/opreturn/index.js b/cashtab/src/opreturn/index.js
--- a/cashtab/src/opreturn/index.js
+++ b/cashtab/src/opreturn/index.js
@@ -8,8 +8,9 @@
 import {
     isValidTokenId,
     meetsAliasSpec,
-    isValidOpreturnParam,
+    getOpReturnRawError,
 } from 'validation';
+import { getStackArray } from 'ecash-script';
 
 /**
  * Initialize an OP_RETURN script element in a way that utxolib.script.compile(script) accepts
@@ -75,6 +76,140 @@
     return cashtabMsgScript.length;
 };
 
+/**
+ * Parse an op_return_raw input according to known op_return specs
+ * The returned output is used to generate a preview of the tx on the SendXec screen
+ * @param {string} opReturnRaw
+ * @returns {object} {protocol: <protocolLabel>, data: <parsedData>}
+ */
+export const parseOpReturnRaw = opReturnRaw => {
+    // Intialize return data
+    const parsed = { protocol: 'Unknown Protocol', data: opReturnRaw };
+    // See if we can parse it with ecash-script
+    let stackArray;
+    try {
+        stackArray = getStackArray(
+            `${opReturn.opReturnPrefixHex}${opReturnRaw}`,
+        );
+    } catch (err) {
+        // Note that in Cashtab we only call parseOpReturnRaw if validation has already cleared this
+        throw new Error('Invalid OP_RETURN');
+    }
+    const firstPush = stackArray[0];
+
+    // Parse known protocol identifiers
+    switch (firstPush) {
+        case opReturn.appPrefixesHex.eToken:
+            parsed.protocol = 'SLP';
+            // Unless there is a reason in the future, do not fully parse all possible slp variations
+            return parsed;
+        case opReturn.appPrefixesHex.cashtab:
+            if (typeof stackArray[1] !== 'undefined') {
+                parsed.protocol = 'Cashtab Msg';
+                parsed.data = Buffer.from(stackArray[1], 'hex').toString(
+                    'utf8',
+                );
+            } else {
+                parsed.protocol = 'Invalid Cashtab Msg';
+            }
+            return parsed;
+        case opReturn.appPrefixesHex.cashtabEncrypted:
+            parsed.protocol = 'Encrypted Cashtab Msg';
+            return parsed;
+        case opReturn.appPrefixesHex.airdrop: {
+            let data = '';
+            if (typeof stackArray[1] !== 'undefined') {
+                parsed.protocol = 'Airdrop';
+                data = `Token ID: ${stackArray[1]}`;
+            }
+            if (typeof stackArray[2] !== 'undefined') {
+                data = `${data}\nMsg: ${Buffer.from(
+                    stackArray[2],
+                    'hex',
+                ).toString('utf8')}`;
+            }
+            if (data === '') {
+                parsed.protocol = 'Invalid Airdrop';
+                return parsed;
+            }
+            parsed.data = data;
+            return parsed;
+        }
+        case opReturn.appPrefixesHex.aliasRegistration: {
+            // Magic numbers per spec
+            // https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/doc/standards/ecash-alias.md
+            if (
+                stackArray[1] === '00' &&
+                typeof stackArray[2] !== 'undefined' &&
+                typeof stackArray[3] !== 'undefined' &&
+                stackArray[3].length === 42
+            ) {
+                const addressTypeByte = stackArray[3].slice(0, 2);
+                let addressType;
+                if (addressTypeByte === '00') {
+                    addressType = 'p2pkh';
+                } else if (addressTypeByte === '08') {
+                    addressType = 'p2sh';
+                } else {
+                    parsed.protocol = 'Invalid Alias Registration';
+                    return parsed;
+                }
+
+                parsed.protocol = 'Alias Registration';
+                parsed.data = `${Buffer.from(stackArray[2], 'hex').toString(
+                    'utf8',
+                )} to ${cashaddr.encode(
+                    'ecash',
+                    addressType,
+                    stackArray[3].slice(1),
+                )}`;
+                return parsed;
+            }
+            parsed.protocol = 'Invalid Alias Registration';
+            return parsed;
+        }
+        case opReturn.appPrefixesHex.paybutton: {
+            // Spec https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/doc/standards/paybutton.md
+            if (
+                stackArray[1] === '00' &&
+                typeof stackArray[2] !== 'undefined' &&
+                typeof stackArray[3] !== 'undefined'
+            ) {
+                parsed.protocol = 'PayButton';
+                const dataPush =
+                    stackArray[2] === '00'
+                        ? ''
+                        : Buffer.from(stackArray[2], 'hex').toString('utf8');
+                const noncePush = stackArray[3] === '00' ? '' : stackArray[3];
+                parsed.data = `${
+                    dataPush !== ''
+                        ? `Data: ${dataPush}${noncePush !== '' ? ', ' : ''}`
+                        : ''
+                }${noncePush !== '' ? `Nonce: ${noncePush}` : ''}`;
+                return parsed;
+            }
+            parsed.protocol = 'Invalid PayButton';
+            parsed.data = opReturnRaw;
+            return parsed;
+        }
+        case opReturn.appPrefixesHex.eCashChat: {
+            // Same spec as a Cashtab msg, different prefix
+            if (typeof stackArray[1] !== 'undefined') {
+                parsed.protocol = 'eCash Chat';
+                parsed.data = Buffer.from(stackArray[1], 'hex').toString(
+                    'utf8',
+                );
+            } else {
+                parsed.protocol = 'Invalid eCash Chat';
+            }
+            return parsed;
+        }
+        default: {
+            return parsed;
+        }
+    }
+};
+
 /**
  * Get targetOutput for an Airdrop tx OP_RETURN from token id and optional user message
  * Airdrop tx spec: <Airdrop Protocol Identifier> <tokenId> <optionalMsg>
@@ -214,7 +349,7 @@
  * @returns {object} targetOutput, e.g. {value: 0, script: <encoded opparam>}
  */
 export const getOpreturnParamTargetOutput = opreturnParam => {
-    if (!isValidOpreturnParam(opreturnParam)) {
+    if (getOpReturnRawError(opreturnParam) !== false) {
         throw new Error(`Invalid opreturnParam "${opreturnParam}"`);
     }
 
diff --git a/cashtab/src/validation/__tests__/index.test.js b/cashtab/src/validation/__tests__/index.test.js
--- a/cashtab/src/validation/__tests__/index.test.js
+++ b/cashtab/src/validation/__tests__/index.test.js
@@ -23,12 +23,13 @@
     isValidRecipient,
     isValidSideshiftObj,
     isValidMultiSendUserInput,
-    isValidOpreturnParam,
     shouldSendXecBeDisabled,
     parseAddressInput,
     isValidCashtabWallet,
     isValidTokenSendOrBurnAmount,
     isValidTokenMintAmount,
+    getOpReturnRawError,
+    nodeWillAcceptOpReturnRaw,
 } from 'validation';
 import {
     validXecAirdropExclusionList,
@@ -350,59 +351,6 @@
             ),
         ).toBe(true);
     });
-    it(`isValidOpreturnParam rejects a string that starts with 6a`, () => {
-        expect(isValidOpreturnParam('6a')).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects a string that starts with invalid pushdata`, () => {
-        expect(isValidOpreturnParam('4d')).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects non-string input`, () => {
-        expect(isValidOpreturnParam(null)).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects non-hex input`, () => {
-        expect(isValidOpreturnParam('nothexvaluesinthisstring')).toBe(false);
-    });
-    it(`isValidOpreturnParam supports a valid hex string under max length`, () => {
-        expect(
-            isValidOpreturnParam(
-                '042e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
-            ),
-        ).toBe(true);
-    });
-    it(`isValidOpreturnParam supports a valid hex string under max length with mixed capitalization`, () => {
-        expect(
-            isValidOpreturnParam(
-                '042E786563000474657374150095e79F51D4260bc0dc3ba7fb77c7be92d0fbdd1d',
-            ),
-        ).toBe(true);
-    });
-    it(`isValidOpreturnParam supports a valid hex string of max length`, () => {
-        expect(
-            isValidOpreturnParam(
-                '04007461624cd73030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313132333435',
-            ),
-        ).toBe(true);
-    });
-    it(`isValidOpreturnParam rejects a string with empty spaces`, () => {
-        expect(
-            isValidOpreturnParam(
-                '04 2e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
-            ),
-        ).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects an empty string`, () => {
-        expect(isValidOpreturnParam('')).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects a valid hex string exceeding max length`, () => {
-        expect(
-            isValidOpreturnParam(
-                '04007461624cd7303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031303030303030303030313030303030303030303130303030303030303031313233343501',
-            ),
-        ).toBe(false);
-    });
-    it(`isValidOpreturnParam rejects a valid hex string that has uneven length (i.e., half a byte)`, () => {
-        expect(isValidOpreturnParam('042e7')).toBe(false);
-    });
     describe('Determining whether Send button should be disabled on SendXec screen', () => {
         const { expectedReturns } = vectors.shouldSendXecBeDisabled;
 
@@ -418,6 +366,8 @@
                 multiSendAddressError,
                 sendWithCashtabMsg,
                 cashtabMsgError,
+                sendWithOpReturnRaw,
+                opReturnRawError,
                 priceApiError,
                 isOneToManyXECSend,
                 sendDisabled,
@@ -433,6 +383,8 @@
                         multiSendAddressError,
                         sendWithCashtabMsg,
                         cashtabMsgError,
+                        sendWithOpReturnRaw,
+                        opReturnRawError,
                         priceApiError,
                         isOneToManyXECSend,
                     ),
@@ -600,4 +552,22 @@
             });
         });
     });
+    describe('Can tell if a string is valid bip21 op_return_raw input, or why it is not', () => {
+        const { expectedReturns } = vectors.getOpReturnRawError;
+        expectedReturns.forEach(expectedReturn => {
+            const { description, opReturnRaw, returned } = expectedReturn;
+            it(`getOpReturnRawError: ${description}`, () => {
+                expect(getOpReturnRawError(opReturnRaw)).toBe(returned);
+            });
+        });
+    });
+    describe('Validates OP_RETURN raw for eCash node broadcast', () => {
+        const { expectedReturns } = vectors.nodeWillAcceptOpReturnRaw;
+        expectedReturns.forEach(expectedReturn => {
+            const { description, opReturnRaw, returned } = expectedReturn;
+            it(`nodeWillAcceptOpReturnRaw: ${description}`, () => {
+                expect(nodeWillAcceptOpReturnRaw(opReturnRaw)).toBe(returned);
+            });
+        });
+    });
 });
diff --git a/cashtab/src/validation/fixtures/vectors.js b/cashtab/src/validation/fixtures/vectors.js
--- a/cashtab/src/validation/fixtures/vectors.js
+++ b/cashtab/src/validation/fixtures/vectors.js
@@ -41,6 +41,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -60,6 +62,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -79,6 +83,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -98,6 +104,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: false,
@@ -117,6 +125,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: true,
                 sendDisabled: true,
@@ -135,6 +145,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -154,6 +166,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: true,
                 sendDisabled: true,
@@ -172,6 +186,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -190,6 +206,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -209,6 +227,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: true,
                 cashtabMsgError: 'a string indicating a validation error msg',
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -228,6 +248,52 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: 'a string indicating a validation error msg',
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
+                priceApiError: false,
+                isOneToManyXECSend: false,
+                sendDisabled: false,
+            },
+            {
+                description:
+                    'Disabled for invalid op_return_raw send to one if user has op_return_raw enabled',
+                formData: {
+                    address: 'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6',
+                    amount: '5',
+                    multiAddressInput: '',
+                    opReturnRaw: 'something invalid', // note this function does not check this field
+                },
+                balanceSats: 10000,
+                apiError: false,
+                sendAmountError: false,
+                sendAddressError: false,
+                multiSendAddressError: false,
+                sendWithCashtabMsg: true,
+                cashtabMsgError: false,
+                sendWithOpReturnRaw: true,
+                opReturnRawError: 'a string indicating a validation error msg',
+                priceApiError: false,
+                isOneToManyXECSend: false,
+                sendDisabled: true,
+            },
+            {
+                description:
+                    'Enabled for invalid op_return_raw if user has op_return_raw disabled',
+                formData: {
+                    address: 'ecash:qp89xgjhcqdnzzemts0aj378nfe2mhu9yvxj9nhgg6',
+                    amount: '5',
+                    multiAddressInput: '',
+                    opReturnRaw: 'something invalid', // note this function does not check this field
+                },
+                balanceSats: 10000,
+                apiError: false,
+                sendAmountError: false,
+                sendAddressError: false,
+                multiSendAddressError: false,
+                sendWithCashtabMsg: false,
+                cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: 'a string indicating a validation error msg',
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: false,
@@ -248,6 +314,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: true,
                 cashtabMsgError: 'a string indicating a validation error msg',
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -266,6 +334,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: true,
                 isOneToManyXECSend: false,
                 sendDisabled: true,
@@ -286,6 +356,8 @@
                 multiSendAddressError: false,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: true,
                 sendDisabled: false,
@@ -307,6 +379,8 @@
                 multiSendAddressError: true,
                 sendWithCashtabMsg: false,
                 cashtabMsgError: false,
+                sendWithOpReturnRaw: false,
+                opReturnRawError: false,
                 priceApiError: false,
                 isOneToManyXECSend: true,
                 sendDisabled: true,
@@ -695,7 +769,7 @@
                     },
                     op_return_raw: {
                         value: 'notvalid042e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
-                        error: `Invalid op_return_raw param "notvalid042e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d"`,
+                        error: `Invalid op_return_raw param: Input must be lowercase hex a-f 0-9.`,
                     },
                     queryString: {
                         value: 'op_return_raw=notvalid042e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
@@ -1826,4 +1900,105 @@
             },
         ],
     },
+    getOpReturnRawError: {
+        expectedReturns: [
+            {
+                description: 'Valid lowercase hex of max length is good',
+                opReturnRaw: Array(222).fill('01').join(''),
+                returned: false,
+            },
+            {
+                description:
+                    'Valid lowercase hex of 1 more than max length is rejected',
+                opReturnRaw: Array(223).fill('01').join(''),
+                returned: 'op_return_raw exceeds 222 bytes',
+            },
+            {
+                description:
+                    'Valid lowercase hex of max length that starts with "6a" is rejected',
+                opReturnRaw: '6adeadbeef',
+                returned:
+                    'op_return_raw will have OP_RETURN (6a) prepended automatically',
+            },
+            {
+                description: 'Valid hex of odd length below max is rejected',
+                opReturnRaw: Array(12).fill('01').join('') + '1',
+                returned:
+                    'op_return_raw input must be in hex bytes. Length of input must be divisible by two.',
+            },
+            {
+                description: 'Uppercase hex is rejected',
+                opReturnRaw: Array(12).fill('FF').join(''),
+                returned: 'Input must be lowercase hex a-f 0-9.',
+            },
+            {
+                description:
+                    'Even-length string containing non-hex characters is rejected',
+                opReturnRaw: 'livebeef',
+                returned: 'Input must be lowercase hex a-f 0-9.',
+            },
+            {
+                description:
+                    'Even-length string containing a space is rejected',
+                opReturnRaw: 'dead beef',
+                returned: 'Input must be lowercase hex a-f 0-9.',
+            },
+            {
+                description: 'Empty string is rejected',
+                opReturnRaw: '',
+                returned: 'Cashtab will not send an empty op_return_raw',
+            },
+            {
+                description: 'String of even spaces is rejected',
+                opReturnRaw: '  ',
+                returned: 'Input must be lowercase hex a-f 0-9.',
+            },
+        ],
+    },
+    nodeWillAcceptOpReturnRaw: {
+        expectedReturns: [
+            {
+                description: 'Rejects a string that starts with 6a',
+                opReturnRaw: '6a',
+                returned: false,
+            },
+            {
+                description:
+                    'Rejects a string that starts with invalid pushdata',
+                opReturnRaw: 'ff',
+                returned: false,
+            },
+            {
+                description: 'Rejects non-string input',
+                opReturnRaw: null,
+                returned: false,
+            },
+            {
+                description: 'Rejects non-hex input',
+                opReturnRaw: 'string',
+                returned: false,
+            },
+            {
+                description: 'Accepts a valid hex string under max length',
+                opReturnRaw:
+                    '042e786563000474657374150095e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d',
+                returned: true,
+            },
+            {
+                description: 'Accepts a valid hex string of max length',
+                opReturnRaw: Array(222).fill('01').join(''),
+                returned: true,
+            },
+            {
+                description: 'Rejects a valid hex string over max length',
+                opReturnRaw: Array(223).fill('01').join(''),
+                returned: false,
+            },
+            {
+                description: 'Rejects a valid hex string of odd length',
+                opReturnRaw: '010',
+                returned: false,
+            },
+        ],
+    },
 };
diff --git a/cashtab/src/validation/index.js b/cashtab/src/validation/index.js
--- a/cashtab/src/validation/index.js
+++ b/cashtab/src/validation/index.js
@@ -505,18 +505,47 @@
     return true;
 };
 
+const VALID_LOWERCASE_HEX_REGEX = /^[a-f0-9]+$/;
 /**
- * Test a bip21 opreturn param for spec compliance
- * @param {string} opreturn
- * @returns {bool}
+ * Validate bip21 op_return_raw input
+ * @param {string} opReturnRaw user input (or webapp tx input) for bip21 op_return_raw
+ * @returns {boolean | string} true if valid, string error msg if not
  */
-export const isValidOpreturnParam = testedParam => {
-    // Spec
-    // The param must contain a valid hex string for a valid `OP_RETURN` output,
-    // not beginning with the`OP_RETURN` `6a`.
+export const getOpReturnRawError = opReturnRaw => {
+    if (opReturnRaw === '') {
+        return 'Cashtab will not send an empty op_return_raw';
+    }
+    if (opReturnRaw.startsWith(opReturn.opReturnPrefixHex)) {
+        return `op_return_raw will have OP_RETURN (6a) prepended automatically`;
+    }
+    if (!VALID_LOWERCASE_HEX_REGEX.test(opReturnRaw)) {
+        return `Input must be lowercase hex a-f 0-9.`;
+    }
+    const BYTE_LENGTH_HEX = 2;
+    if (
+        opReturnRaw.length / BYTE_LENGTH_HEX >
+        opReturn.opreturnParamByteLimit
+    ) {
+        return `op_return_raw exceeds ${opReturn.opreturnParamByteLimit} bytes`;
+    }
+    if (opReturnRaw.length % BYTE_LENGTH_HEX !== 0) {
+        return `op_return_raw input must be in hex bytes. Length of input must be divisible by two.`;
+    }
+    if (!nodeWillAcceptOpReturnRaw(opReturnRaw)) {
+        return 'Invalid OP_RETURN';
+    }
+    // No error
+    return false;
+};
 
+/**
+ * Test a bip21 op_return_raw param to see if an eCash node will accept it
+ * @param {string} opReturnRaw
+ * @returns {bool}
+ */
+export const nodeWillAcceptOpReturnRaw = opReturnRaw => {
     try {
-        if (testedParam === '') {
+        if (opReturnRaw === '') {
             // No empty OP_RETURN for this param per ecash bip21 spec
             return false;
         }
@@ -524,7 +553,7 @@
         // Use validation from ecash-script library
         // Apply .toLowerCase() to support uppercase, lowercase, or mixed case input
         getStackArray(
-            `${opReturn.opReturnPrefixHex}${testedParam.toLowerCase()}`,
+            `${opReturn.opReturnPrefixHex}${opReturnRaw.toLowerCase()}`,
         );
 
         return true;
@@ -542,6 +571,8 @@
  * @param {false | string} sendAddressError
  * @param {boolean} sendWithCashtabMsg
  * @param {false | string} cashtabMsgError
+ * @param {boolean} sendWithOpReturnRaw
+ * @param {false | string} opReturnRawError
  * @param {boolean} priceApiError
  * @param {boolean} isOneToManyXECSend
  * @returns boolean
@@ -555,6 +586,8 @@
     multiSendAddressError,
     sendWithCashtabMsg,
     cashtabMsgError,
+    sendWithOpReturnRaw,
+    opReturnRawError,
     priceApiError,
     isOneToManyXECSend,
 ) => {
@@ -576,6 +609,8 @@
         sendAddressError !== false ||
         // Disabled if msg fails validation AND we are sending the msg
         (sendWithCashtabMsg && cashtabMsgError !== false) ||
+        // Disabled if op_return_raw fails validation AND we are sending with op_return_raw
+        (sendWithOpReturnRaw && opReturnRawError !== false) ||
         // Disabled if we do not have a fiat price AND the user is attempting to send fiat
         priceApiError ||
         // Disabled if send to many and we have a send to many validation error
@@ -699,9 +734,10 @@
                     value: opreturnParam,
                     error: false,
                 };
-                if (!isValidOpreturnParam(opreturnParam)) {
-                    // opreturn must be valid
-                    parsedAddressInput.op_return_raw.error = `Invalid op_return_raw param "${opreturnParam}"`;
+                const opReturnRawError = getOpReturnRawError(opreturnParam);
+                if (opReturnRawError !== false) {
+                    // If we have an invalid op_return_raw param, set error
+                    parsedAddressInput.op_return_raw.error = `Invalid op_return_raw param: ${opReturnRawError}`;
                 }
             }
         }