diff --git a/web/cashtab/src/components/Wallet/Tx.js b/web/cashtab/src/components/Wallet/Tx.js --- a/web/cashtab/src/components/Wallet/Tx.js +++ b/web/cashtab/src/components/Wallet/Tx.js @@ -435,26 +435,20 @@ {/*unencrypted OP_RETURN Message*/} {data.opReturnMessage && !data.isEncryptedMessage - ? Buffer.from( - data.opReturnMessage, - ).toString() + ? data.opReturnMessage : ''} {/*encrypted and wallet is authorized to view OP_RETURN Message*/} {data.opReturnMessage && data.isEncryptedMessage && data.decryptionSuccess - ? Buffer.from( - data.opReturnMessage, - ).toString() + ? data.opReturnMessage : ''} {/*encrypted but wallet is not authorized to view OP_RETURN Message*/} {data.opReturnMessage && data.isEncryptedMessage && !data.decryptionSuccess ? ( - {Buffer.from( - data.opReturnMessage, - ).toString()} + {data.opReturnMessage} ) : ( '' diff --git a/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js b/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js --- a/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js +++ b/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js @@ -85,7 +85,7 @@ confirmations: 59, destinationAddress: undefined, height: undefined, - opReturnMessage: new Buffer('bingoelectrum'), + opReturnMessage: 'bingoelectrum', replyAddress: null, outgoingTx: false, tokenTx: false, @@ -103,7 +103,7 @@ confirmations: 70, destinationAddress: undefined, height: undefined, - opReturnMessage: new Buffer('cashtabular'), + opReturnMessage: 'cashtabular', replyAddress: 'ecash:qrxkkzsmrxcjmz8x90fx2uztt83cuu0u254w09pq5p', outgoingTx: false, tokenTx: false, diff --git a/web/cashtab/src/hooks/useBCH.js b/web/cashtab/src/hooks/useBCH.js --- a/web/cashtab/src/hooks/useBCH.js +++ b/web/cashtab/src/hooks/useBCH.js @@ -326,7 +326,7 @@ parsedTx.outgoingTx = outgoingTx; parsedTx.replyAddress = senderAddress; parsedTx.destinationAddress = destinationAddress; - parsedTx.opReturnMessage = opReturnMessage; + parsedTx.opReturnMessage = Buffer.from(opReturnMessage).toString(); parsedTx.isCashtabMessage = isCashtabMessage; parsedTx.isEncryptedMessage = isEncryptedMessage; parsedTx.decryptionSuccess = decryptionSuccess;