fix: oldObj should not overwrite properties

2022-12-01 12:21:25 +01:00
parent 755ce9c7da
commit 5ddad18f64
1 changed files with 2 additions and 3 deletions
@@ -14,15 +14,14 @@ const retryWithDelay = async function (fn, retryCount = 0) {
 }

 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.time = minutesToTime(obj.time)
  charge.timeLeft = minutesToTime(obj.time_left)

-  charge.expanded = false
  charge.displayUrl = ['/satspay/', obj.id].join('')
-  charge.expanded = oldObj.expanded
+  charge.expanded = oldObj.expanded || false
  charge.pendingBalance = oldObj.pendingBalance || 0
  return charge
 }