Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-04-01 18:15:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sign tx json output

Browse Source
This commit is contained in:
AlphaX-Qortal 2025-02-18 18:05:57 +01:00
parent e2d6d83fd8
commit c686a12c3a
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/plugins/core/qdn/browser/browser.src.js
View File

@ -3365,10 +3365,11 @@ class WebBrowser extends LitElement {
const signRequest = await showModalAndWait( const signRequest = await showModalAndWait(
actions.SIGN_TRANSACTION, actions.SIGN_TRANSACTION,
{ {
text1: `${shouldProcess ? get("modals.mpchange65") : get("modals.mpchange6")}`, text1: `${shouldProcess ? get("modals.mpchange65") : get("modals.mpchange66")}`,
text2: get("modals.mpchange67"), text2: get("modals.mpchange67"),
text3: `${get("modals.mpchange68")} ${decodedData.type}`, text3: `${get("modals.mpchange68")} ${decodedData.type}`,
json: `${get("modals.mpchange69")} ${decodedData}` txdata: `${get("modals.mpchange69")}`,
txjson: `${JSON.stringify(decodedData)}`
} }
) )
if (signRequest.action === 'accept') { if (signRequest.action === 'accept') {
@ -3399,10 +3400,7 @@ class WebBrowser extends LitElement {
const signedBytes = appendBuffer(arbitraryBytesBuffer, signature) const signedBytes = appendBuffer(arbitraryBytesBuffer, signature)
const signedBytesToBase58 = Base58.encode(signedBytes) const signedBytesToBase58 = Base58.encode(signedBytes)
if(!shouldProcess) { if(!shouldProcess) {
let myMsg1 = get("modals.mpchange70") response = signedBytesToBase58
let myMsg2 = get("modals.mpchange71") + signedBytesToBase58
await showSuccessAndWait("REQUEST_SUCCESS", { id1: myMsg1, id2: myMsg2 })
response = '{"error": "Process transaction was not requested!"}'
break break
} }
try { try {
@ -5265,7 +5263,8 @@ async function showModalAndWait(type, data) {
<p class="modal-paragraph">${data.text1}</p> <p class="modal-paragraph">${data.text1}</p>
<p class="modal-paragraph">${data.text2}</p> <p class="modal-paragraph">${data.text2}</p>
<p class="modal-paragraph">${data.text3}</p> <p class="modal-paragraph">${data.text3}</p>
<p class="modal-paragraph">Transaction: <span>${data.json}</span></p> <p class="modal-paragraph"><span>${data.txdata}</span></p>
<p class="modal-paragraph"><span>${convertJson(data.txjson)}</span></p>
` : ''} ` : ''}
${type === actions.CREATE_TRADE_BUY_ORDER ? ` ${type === actions.CREATE_TRADE_BUY_ORDER ? `
@ -5415,6 +5414,35 @@ async function showModalAndWait(type, data) {
}) })
} }
function convertJson(jsonStr) {
let regeStr = ''
let f = {
brace: 0
}
regeStr = jsonStr.replace(/({|}[,]*|[^{}:]+:[^{}:,]*[,{]*)/g, function (m, p1) {
const rtnFn = function() {
return '<div style="text-indent: ' + (f['brace'] * 20) + 'px;color: var(--black);">' + p1 + '</div>'
}
let rtnStr = 0
if (p1.lastIndexOf('{') === (p1.length - 1)) {
rtnStr = rtnFn()
f['brace'] += 1
} else if (p1.indexOf('}') === 0) {
f['brace'] -= 1
rtnStr = rtnFn()
} else {
rtnStr = rtnFn()
}
return rtnStr
})
return regeStr
}
async function showErrorAndWait(type, data) { async function showErrorAndWait(type, data) {
// Create the modal and add it to the DOM // Create the modal and add it to the DOM
const modalDelay = ms => new Promise(res => setTimeout(res, ms)) const modalDelay = ms => new Promise(res => setTimeout(res, ms))