mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2024-11-19 18:11:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: oldObj should not overwrite properties

Browse Source
This commit is contained in:
Vlad Stan 2022-11-24 11:39:35 +02:00
parent a8d4835b74
commit 4b4f18fad5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnbits/extensions/satspay/static/js/utils.js
View File

@ -14,15 +14,14 @@ const retryWithDelay = async function (fn, retryCount = 0) {
} }
const mapCharge = (obj, oldObj = {}) => { const mapCharge = (obj, oldObj = {}) => {
const charge = {...obj, ...oldObj} const charge = {...oldObj, ...obj}
charge.progress = obj.time_left < 0 ? 1 : 1 - obj.time_left / obj.time charge.progress = obj.time_left < 0 ? 1 : 1 - obj.time_left / obj.time
charge.time = minutesToTime(obj.time) charge.time = minutesToTime(obj.time)
charge.timeLeft = minutesToTime(obj.time_left) charge.timeLeft = minutesToTime(obj.time_left)
charge.expanded = false
charge.displayUrl = ['/satspay/', obj.id].join('') charge.displayUrl = ['/satspay/', obj.id].join('')
charge.expanded = oldObj.expanded charge.expanded = oldObj.expanded || false
charge.pendingBalance = oldObj.pendingBalance || 0 charge.pendingBalance = oldObj.pendingBalance || 0
return charge return charge
} }